diff --git a/data/json/AchievementCollectionDefinition/15.json b/data/json/AchievementCollectionDefinition/15.json
index e2faec2b74512718c6dd5f888d86e00f46232ad5..8869851648252626e997d69eedab4a79983069ce 100644
--- a/data/json/AchievementCollectionDefinition/15.json
+++ b/data/json/AchievementCollectionDefinition/15.json
@@ -4,13 +4,16 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 15,
-    "world": 8,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
-      "achievements": []
+      "achievements": [
+        592
+      ],
+      "worldId": 8
     },
     "dungeonCollections": [],
     "questCollections": [],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Bonta Island",
diff --git a/data/json/AchievementCollectionDefinition/216.json b/data/json/AchievementCollectionDefinition/216.json
index 428c58c7400c03124589c833a7ba475015d263b0..82164f249b9693056b794c46babe4847a2700b7d 100644
--- a/data/json/AchievementCollectionDefinition/216.json
+++ b/data/json/AchievementCollectionDefinition/216.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 216,
-    "world": 2,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         600,
         974,
         22
-      ]
+      ],
+      "worldId": 2
     },
     "dungeonCollections": [
       {
@@ -81,6 +81,7 @@
         "questId": 8
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Chafer Island",
diff --git a/data/json/AchievementCollectionDefinition/25.json b/data/json/AchievementCollectionDefinition/25.json
index 638587122dbc4ecec9c644256512d2f094b5fa88..88463508b6d5e8019a03b2f2d7c1ccab9bec7da2 100644
--- a/data/json/AchievementCollectionDefinition/25.json
+++ b/data/json/AchievementCollectionDefinition/25.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 25,
-    "world": 3,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         373,
         649,
         485
-      ]
+      ],
+      "worldId": 3
     },
     "dungeonCollections": [
       {
@@ -81,6 +81,7 @@
         "questId": 68
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Tofu Island",
diff --git a/data/json/AchievementCollectionDefinition/265.json b/data/json/AchievementCollectionDefinition/265.json
index 1643bff4c2c99f23203c859ef24685ab783a13e1..cbb0a78ed76cf5a5e01a5be9f01413a2a509cc33 100644
--- a/data/json/AchievementCollectionDefinition/265.json
+++ b/data/json/AchievementCollectionDefinition/265.json
@@ -4,10 +4,12 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 265,
-    "world": 18,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
-      "achievements": []
+      "achievements": [
+        708
+      ],
+      "worldId": 18
     },
     "dungeonCollections": [
       {
@@ -38,6 +40,7 @@
         "questId": 70
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Craqueleur Island",
diff --git a/data/json/AchievementCollectionDefinition/414.json b/data/json/AchievementCollectionDefinition/414.json
index 5853cb591b5c65dbdbc655bd1b7001db4d685eeb..c7638089552ca87921660bd51cb69dbcf0bce123 100644
--- a/data/json/AchievementCollectionDefinition/414.json
+++ b/data/json/AchievementCollectionDefinition/414.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 414,
-    "world": 5,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         302,
         552,
         309
-      ]
+      ],
+      "worldId": 5
     },
     "dungeonCollections": [
       {
@@ -81,6 +81,7 @@
         "questId": 40
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Cochon Island",
diff --git a/data/json/AchievementCollectionDefinition/467.json b/data/json/AchievementCollectionDefinition/467.json
index 7d22fa02b31d222e7f243c9cc99cf60363ee0e36..6d833ec7a9cd645e2a5d256b1a338282d836ee9e 100644
--- a/data/json/AchievementCollectionDefinition/467.json
+++ b/data/json/AchievementCollectionDefinition/467.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 467,
-    "world": 4,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         960,
         671,
         232
-      ]
+      ],
+      "worldId": 4
     },
     "dungeonCollections": [
       {
@@ -81,6 +81,7 @@
         "questId": 7
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Bouftou Island",
diff --git a/data/json/AchievementCollectionDefinition/557.json b/data/json/AchievementCollectionDefinition/557.json
index 311f135dbf7854360a39bfb9d48854989fade583..e4aa31f195b555c9cedef321ae28c85b92639311 100644
--- a/data/json/AchievementCollectionDefinition/557.json
+++ b/data/json/AchievementCollectionDefinition/557.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 557,
-    "world": 6,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         965,
         964,
         863
-      ]
+      ],
+      "worldId": 6
     },
     "dungeonCollections": [
       {
@@ -66,11 +66,11 @@
           941,
           922,
           997,
+          284,
           61,
           900,
           802,
           973,
-          284,
           660,
           405,
           815,
@@ -81,6 +81,7 @@
         "questId": 30
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Bwork Island",
diff --git a/data/json/AchievementCollectionDefinition/56.json b/data/json/AchievementCollectionDefinition/56.json
index cb5fc7bdf69da0fc73f871aef1fd7c85dfbac4ce..1cd9edf21123d17ac47b08fb4aff2c1faec175c8 100644
--- a/data/json/AchievementCollectionDefinition/56.json
+++ b/data/json/AchievementCollectionDefinition/56.json
@@ -4,10 +4,12 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 56,
-    "world": 1,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
-      "achievements": []
+      "achievements": [
+        189
+      ],
+      "worldId": 1
     },
     "dungeonCollections": [
       {
@@ -16,13 +18,8 @@
         "dungeonId": 10
       }
     ],
-    "questCollections": [
-      {
-        "type": "QuestAchievementSubCollection",
-        "achievements": [],
-        "questId": 9
-      }
-    ],
+    "questCollections": [],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Ecailleux Island",
diff --git a/data/json/AchievementCollectionDefinition/621.json b/data/json/AchievementCollectionDefinition/621.json
index bf41abf3945a33985fcb6779ed004553d80a79b0..a0ed0226718007711551e5611d7ec82264735285 100644
--- a/data/json/AchievementCollectionDefinition/621.json
+++ b/data/json/AchievementCollectionDefinition/621.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 621,
-    "world": 7,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         217,
         141,
         271
-      ]
+      ],
+      "worldId": 7
     },
     "dungeonCollections": [
       {
@@ -81,6 +81,7 @@
         "questId": 47
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Chuchoteur Island",
diff --git a/data/json/AchievementCollectionDefinition/691.json b/data/json/AchievementCollectionDefinition/691.json
index 1f08751c82ae38aa2a91be10ffa600eec179fafd..f6895bcf4dd29751baa35c239fb5266e7478ca91 100644
--- a/data/json/AchievementCollectionDefinition/691.json
+++ b/data/json/AchievementCollectionDefinition/691.json
@@ -4,10 +4,12 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 691,
-    "world": 0,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
-      "achievements": []
+      "achievements": [
+        37
+      ],
+      "worldId": 26
     },
     "dungeonCollections": [
       {
@@ -17,8 +19,9 @@
       }
     ],
     "questCollections": [],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Gelée Island",
-  "m_availability": 2
+  "m_availability": 0
 }
\ No newline at end of file
diff --git a/data/json/AchievementCollectionDefinition/792.json b/data/json/AchievementCollectionDefinition/792.json
index d37a0047089f7fd6b57a9825876f10638d13b493..5986ea8e66e76c85ab0f0fdd65b70f617326dc65 100644
--- a/data/json/AchievementCollectionDefinition/792.json
+++ b/data/json/AchievementCollectionDefinition/792.json
@@ -4,7 +4,6 @@
   "m_jsonRepresentation": {
     "type": "AchievementCollectionDefinition",
     "id": 792,
-    "world": 9,
     "worldCollection": {
       "type": "WorldAchievementSubCollection",
       "achievements": [
@@ -23,7 +22,8 @@
         304,
         864,
         293
-      ]
+      ],
+      "worldId": 9
     },
     "dungeonCollections": [
       {
@@ -81,6 +81,7 @@
         "questId": 78
       }
     ],
+    "endlessFightCollections": [],
     "rewardByPQThreshold": []
   },
   "m_displayName": "Taure Island",
diff --git a/data/json/AchievementDefinition/308.json b/data/json/AchievementDefinition/308.json
index ba2f051c03f4554d87c5c1b6bb3e488bde939fa6..1555234442ee12028164fa14208f3aede2d84634 100644
--- a/data/json/AchievementDefinition/308.json
+++ b/data/json/AchievementDefinition/308.json
@@ -7,7 +7,9 @@
     "points": 0,
     "secret": true,
     "rewards": [],
-    "subAchievements": []
+    "subAchievements": [
+      148
+    ]
   },
   "m_displayName": "CHAFER - Dungeon - Lettre à Colombe",
   "m_availability": 0,
diff --git a/data/json/ChallengePoolDefinition/266.json b/data/json/ChallengePoolDefinition/266.json
deleted file mode 100644
index af813636ad17af068a8433a2c10f8569b27c612b..0000000000000000000000000000000000000000
--- a/data/json/ChallengePoolDefinition/266.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "266",
-  "m_jsonRepresentation": {
-    "type": "ChallengePoolDefinition",
-    "id": 266,
-    "weight": 100,
-    "challenges": [
-      228,
-      75,
-      95,
-      147,
-      330,
-      967,
-      741,
-      388,
-      346,
-      521,
-      921,
-      880,
-      912,
-      607,
-      782,
-      570,
-      877
-    ]
-  },
-  "m_displayName": "COMMON - Coop without 930, 568 \u0026 986",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/ChallengePoolDefinition/307.json b/data/json/ChallengePoolDefinition/307.json
deleted file mode 100644
index 54b3981e1381ad0fcbec6f670cf7400e918376bf..0000000000000000000000000000000000000000
--- a/data/json/ChallengePoolDefinition/307.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "307",
-  "m_jsonRepresentation": {
-    "type": "ChallengePoolDefinition",
-    "id": 307,
-    "weight": 100,
-    "challenges": [
-      228,
-      75,
-      95,
-      147,
-      330,
-      967,
-      568,
-      741,
-      930,
-      986,
-      388,
-      346,
-      521,
-      921,
-      880,
-      912,
-      607,
-      782,
-      570,
-      877
-    ]
-  },
-  "m_displayName": "COMMON - Coop",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/ChallengePoolDefinition/33.json b/data/json/ChallengePoolDefinition/33.json
deleted file mode 100644
index 1564db8f0ae9a3d066ad7b735e937f3c55c011ab..0000000000000000000000000000000000000000
--- a/data/json/ChallengePoolDefinition/33.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "33",
-  "m_jsonRepresentation": {
-    "type": "ChallengePoolDefinition",
-    "id": 33,
-    "weight": 100,
-    "challenges": [
-      228,
-      346,
-      75,
-      95,
-      147,
-      330,
-      967,
-      741,
-      388,
-      521,
-      921,
-      912,
-      607
-    ]
-  },
-  "m_displayName": "COMMON - Solo without 930, 568 \u0026 986",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/ChallengePoolDefinition/331.json b/data/json/ChallengePoolDefinition/331.json
deleted file mode 100644
index b1dd8903567a516f095d099fb4c5d2ab1b9fa4d9..0000000000000000000000000000000000000000
--- a/data/json/ChallengePoolDefinition/331.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "331",
-  "m_jsonRepresentation": {
-    "type": "ChallengePoolDefinition",
-    "id": 331,
-    "weight": 100,
-    "challenges": [
-      228,
-      346,
-      75,
-      95,
-      147,
-      330,
-      967
-    ]
-  },
-  "m_displayName": "SPECIAL - Combat contre Niels DJ COCHON",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/ChallengePoolDefinition/779.json b/data/json/ChallengePoolDefinition/779.json
deleted file mode 100644
index 91e2b087690cbd2ce984f705c005d308764b5400..0000000000000000000000000000000000000000
--- a/data/json/ChallengePoolDefinition/779.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "779",
-  "m_jsonRepresentation": {
-    "type": "ChallengePoolDefinition",
-    "id": 779,
-    "weight": 100,
-    "challenges": [
-      228,
-      75,
-      95,
-      147,
-      330,
-      967,
-      568,
-      741,
-      930,
-      986,
-      388,
-      521,
-      921,
-      912,
-      607,
-      346
-    ]
-  },
-  "m_displayName": "COMMON - Solo",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1053.json b/data/json/CharacterSkinDefinition/1053.json
index 582965a46b1db66bd31c579f4fe84973f0194040..6fc4948a3140e32c8138454003468a0c4b6a4500 100644
--- a/data/json/CharacterSkinDefinition/1053.json
+++ b/data/json/CharacterSkinDefinition/1053.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
+  "m_displayName": "MONSTRE - VAMPYRE - Chauve-Souris Base F",
   "m_availability": 0,
   "m_i18nNameId": 5464,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/1075.json b/data/json/CharacterSkinDefinition/1075.json
index a1b6df719b72289c298a12efe65f536338763437..a01e9458aaf69fe67452d8d4d851a49c7606c214 100644
--- a/data/json/CharacterSkinDefinition/1075.json
+++ b/data/json/CharacterSkinDefinition/1075.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - VAMPYRE - Berserk M",
+  "m_displayName": "MONSTRE - VAMPYRE - Berserker M",
   "m_availability": 0,
   "m_i18nNameId": 80232,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/1148.json b/data/json/CharacterSkinDefinition/1148.json
index 66572831c4f734b170479795e4391d0de85b7040..00ad75c9f4beec5ca71b8aa506c36a515a83710c 100644
--- a/data/json/CharacterSkinDefinition/1148.json
+++ b/data/json/CharacterSkinDefinition/1148.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Marin Pelikan",
+  "m_displayName": "PNJ - BONTA - Marin Pelikan",
   "m_availability": 3,
   "m_i18nNameId": 36942,
   "m_i18nDescriptionId": 39954,
diff --git a/data/json/CharacterSkinDefinition/1149.json b/data/json/CharacterSkinDefinition/1149.json
index ea96d218e18965da5d5d474d2980d196ea5af2d8..ec11f7e2030f0b29efec1b90a33b346c8e952251 100644
--- a/data/json/CharacterSkinDefinition/1149.json
+++ b/data/json/CharacterSkinDefinition/1149.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "PNJ - CHAFER - Obléro",
+  "m_displayName": "PNJ - QUETE - CHAFER - Obléro",
   "m_availability": 3,
   "m_i18nNameId": 43324,
   "m_i18nDescriptionId": 38940,
diff --git a/data/json/CharacterSkinDefinition/1175.json b/data/json/CharacterSkinDefinition/1175.json
index bd9b76331eebad867e866b6fc52e44567e00c358..84893ea013a1c7fbb0ff919411049c7a2bff8dd7 100644
--- a/data/json/CharacterSkinDefinition/1175.json
+++ b/data/json/CharacterSkinDefinition/1175.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
-  "m_availability": 0,
+  "m_displayName": "SUMMONING - RING - ???",
+  "m_availability": 2,
   "m_i18nNameId": 77704,
   "m_i18nDescriptionId": 0,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1222.json b/data/json/CharacterSkinDefinition/1222.json
index 11a235c5c5e8114a30144eb55bb778bb99f50602..381b5a0b70e4aad8627c2cfea6f728f61b2e42a2 100644
--- a/data/json/CharacterSkinDefinition/1222.json
+++ b/data/json/CharacterSkinDefinition/1222.json
@@ -12,14 +12,18 @@
         "amount": 15000
       }
     ],
-    "gender": 1,
-    "defaultEmotes": []
+    "gender": 2,
+    "defaultEmotes": [
+      159,
+      588,
+      409
+    ]
   },
-  "m_displayName": "WEAPON - CRA - Arc Piven F - Skin 1",
-  "m_availability": 2,
+  "m_displayName": "WEAPON - CRA - Arc Piven F - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 44390,
   "m_i18nDescriptionId": 60173,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "162512f7cede45ef863b940e82c40325",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1243.json b/data/json/CharacterSkinDefinition/1243.json
index 5a1078087e9c247b039049e1a59eda2355b04219..a150a1a6d8bc1046d0fc40b02ea52cdac24ec9b8 100644
--- a/data/json/CharacterSkinDefinition/1243.json
+++ b/data/json/CharacterSkinDefinition/1243.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - BWORKAKORN - CLAN VOLCANO",
+  "m_availability": 3,
   "m_i18nNameId": 28414,
   "m_i18nDescriptionId": 70311,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1246.json b/data/json/CharacterSkinDefinition/1246.json
index 7eb5ca95952f65c1ce5dde60a30bbb7642f727f2..b4fa54d805c927dad87f842b15c7ad0099972080 100644
--- a/data/json/CharacterSkinDefinition/1246.json
+++ b/data/json/CharacterSkinDefinition/1246.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN PIRA\u0027BWORK - Bworkakorn Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 59887,
   "m_i18nDescriptionId": 76642,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1255.json b/data/json/CharacterSkinDefinition/1255.json
index 93b68ded5d4d8cbdf6b43c1d375eee8c8debd379..93a5de786de74a323be2e08bb249d4bc2c4c3ae8 100644
--- a/data/json/CharacterSkinDefinition/1255.json
+++ b/data/json/CharacterSkinDefinition/1255.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1255,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      619,
+      677,
+      610
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Aiguille Pikuxala M - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 52146,
   "m_i18nDescriptionId": 12797,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "a1dc2fe1171a4ce5a8b60a2392385b65",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1268.json b/data/json/CharacterSkinDefinition/1268.json
index 995a3bd195970b0b7a301ecc988d3152c17abea0..b1b6fe72c02b06df7ff1c87afec83b8ffd0de3c5 100644
--- a/data/json/CharacterSkinDefinition/1268.json
+++ b/data/json/CharacterSkinDefinition/1268.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "PNJ - MARCHAND - BWORK - Marchand 3 B",
+  "m_displayName": "PNJ - MARCHAND - BWORK - Ecaprifon B",
   "m_availability": 3,
   "m_i18nNameId": 99901,
   "m_i18nDescriptionId": 12447,
diff --git a/data/json/CharacterSkinDefinition/1294.json b/data/json/CharacterSkinDefinition/1294.json
index 4990f9adf50997ef91b4cae63c955302899ae4bb..7561fe54ff83654c6bd543d37c54e7dcbc768c7b 100644
--- a/data/json/CharacterSkinDefinition/1294.json
+++ b/data/json/CharacterSkinDefinition/1294.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "GARDIEN - CHAFER - SURIN - Azor l\u0027Exécuteur",
-  "m_availability": 2,
+  "m_availability": 0,
   "m_i18nNameId": 84565,
   "m_i18nDescriptionId": 99231,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1306.json b/data/json/CharacterSkinDefinition/1306.json
index 008d953cb3ddaf7bc29b6c3638373f97a7fcbaa3..a4aae5ffecdcb12c7c6907527cfadc49918039d0 100644
--- a/data/json/CharacterSkinDefinition/1306.json
+++ b/data/json/CharacterSkinDefinition/1306.json
@@ -6,11 +6,11 @@
     "id": 1306,
     "rarity": 0,
     "merchantCosts": [],
-    "gender": 1,
+    "gender": 2,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN VOLCANO\u0027CULTE - Bworkette Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 42806,
   "m_i18nDescriptionId": 17094,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1310.json b/data/json/CharacterSkinDefinition/1310.json
index 333e008f653491eb4628ed7e1618c19a873bb7e1..089d76fbca80a2fc5309a5b24f9c6bbbb1e385e3 100644
--- a/data/json/CharacterSkinDefinition/1310.json
+++ b/data/json/CharacterSkinDefinition/1310.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1310,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      162,
+      125,
+      100
+    ]
   },
   "m_displayName": "WEAPON - CRA - Bunelame M - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 37480,
   "m_i18nDescriptionId": 88326,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "980d629f6ede43cf99f4412ad231e77c",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1327.json b/data/json/CharacterSkinDefinition/1327.json
index bcd89e9b1b7443e48e3b400aafdadcec7c90d8b1..5122d58ad981b55d9d077cf723132263b9cb2f31 100644
--- a/data/json/CharacterSkinDefinition/1327.json
+++ b/data/json/CharacterSkinDefinition/1327.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1327,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      520,
+      966,
+      389
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Catalysateur Pramium M - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 5401,
   "m_i18nDescriptionId": 5172,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "c0f90ace08ee4162a830fbb238a44807",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1365.json b/data/json/CharacterSkinDefinition/1365.json
index eab9daf296f43251bbd52d6ec714639a3bc3015d..e384e6b210f9eff525c08f8a69c786bbc3b9a2fd 100644
--- a/data/json/CharacterSkinDefinition/1365.json
+++ b/data/json/CharacterSkinDefinition/1365.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1365,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      353,
+      179,
+      805
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Synchronisateur Tako M - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 35800,
   "m_i18nDescriptionId": 2038,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "e06aa4a8984940c6a6d736a92e9a9f0b",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1371.json b/data/json/CharacterSkinDefinition/1371.json
index 5ba5b42627195f01d18a2ce7055863c336a63548..3d2992d072d986a2af8c0c22900e46c77fa584b8 100644
--- a/data/json/CharacterSkinDefinition/1371.json
+++ b/data/json/CharacterSkinDefinition/1371.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MECHANISM - XELOR - Sinistro Neutre",
+  "m_displayName": "MECHANISM - XELOR - Sinistro Astral",
   "m_availability": 3,
   "m_i18nNameId": 44752,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/138.json b/data/json/CharacterSkinDefinition/138.json
index 60bac57762a63653c7316f780631bf199401f180..fa9b33d535c6ae334c78ffe4fed4bc884e3f9490 100644
--- a/data/json/CharacterSkinDefinition/138.json
+++ b/data/json/CharacterSkinDefinition/138.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - COCHON - 3B",
-  "m_availability": 0,
+  "m_displayName": "GARDIEN - COCHON - NINJA - Jamon le Shihan",
+  "m_availability": 2,
   "m_i18nNameId": 19247,
   "m_i18nDescriptionId": 79135,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1574.json b/data/json/CharacterSkinDefinition/1574.json
index 8a386ebf02f1d4c5ad5dca9718b367a4fcef05f4..57f76382c0dc0610f8990048c3b3fe6fbcd8a5a2 100644
--- a/data/json/CharacterSkinDefinition/1574.json
+++ b/data/json/CharacterSkinDefinition/1574.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      605,
+      865,
+      73
+    ]
   },
   "m_displayName": "WEAPON - IOP - Flamboyante Kasai M - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 65929,
   "m_i18nDescriptionId": 71529,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "d9eec74379024fb5a45dd99fbc07a6ca",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1677.json b/data/json/CharacterSkinDefinition/1677.json
index e6230f4b29ef7bc405b823b8a0d5fc2a8cd2a251..18479e01ff5048913d4de15f32cf9d621ca92cfe 100644
--- a/data/json/CharacterSkinDefinition/1677.json
+++ b/data/json/CharacterSkinDefinition/1677.json
@@ -7,10 +7,14 @@
     "rarity": 0,
     "merchantCosts": [],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      893,
+      400,
+      31
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - SURVIVOR",
+  "m_availability": 3,
   "m_i18nNameId": 28928,
   "m_i18nDescriptionId": 77777,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1706.json b/data/json/CharacterSkinDefinition/1706.json
deleted file mode 100644
index 3644a248bd207f5f026673a6b6fc9d6939cea87b..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/1706.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "1706",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 1706,
-    "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
-  },
-  "m_displayName": "MECHANISM - XELOR - Xelocube Lunaire",
-  "m_availability": 0,
-  "m_i18nNameId": 34482,
-  "m_i18nDescriptionId": 17698,
-  "assetGuid": "",
-  "m_eventGuid": "",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1735.json b/data/json/CharacterSkinDefinition/1735.json
index b4d480eb59d2d178cbe3c12bb679e5b631d885c1..58669a269edf8aba6a51cf51b792a8ca234e5489 100644
--- a/data/json/CharacterSkinDefinition/1735.json
+++ b/data/json/CharacterSkinDefinition/1735.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - SURIN - Hochos Bochos",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - SURIN - Kasimordo",
+  "m_availability": 3,
   "m_i18nNameId": 76538,
   "m_i18nDescriptionId": 70248,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/1755.json b/data/json/CharacterSkinDefinition/1755.json
index 61fca6d6ab632904f0f1e4048abd4634ec1410d7..3aa7092188b4893acdde21e2f16b4be6ce9c8f16 100644
--- a/data/json/CharacterSkinDefinition/1755.json
+++ b/data/json/CharacterSkinDefinition/1755.json
@@ -12,14 +12,18 @@
         "amount": 15000
       }
     ],
-    "gender": 1,
-    "defaultEmotes": []
+    "gender": 2,
+    "defaultEmotes": [
+      159,
+      588,
+      409
+    ]
   },
-  "m_displayName": "WEAPON - CRA - Arc Piven F - Skin 2",
-  "m_availability": 2,
+  "m_displayName": "WEAPON - CRA - Arc Piven F - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 90324,
   "m_i18nDescriptionId": 92757,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "162512f7cede45ef863b940e82c40325",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1771.json b/data/json/CharacterSkinDefinition/1771.json
index 12d373ab5831473f3e51168c1158f5527fe616f2..badcb4ae632f0c31510e59ab28d40b50be04f675 100644
--- a/data/json/CharacterSkinDefinition/1771.json
+++ b/data/json/CharacterSkinDefinition/1771.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1771,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      775,
+      472,
+      23
+    ]
   },
   "m_displayName": "WEAPON - CRA - Shiru Shaden M - Skin 01",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 3059,
   "m_i18nDescriptionId": 62747,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "773f021819e84b41a17cf2a36a07e2a7",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/18.json b/data/json/CharacterSkinDefinition/18.json
index 921cc6663a99e0a477b8fa5430589496c175e512..5327e5f01e1fabe1b080149dc3559e739fdb5f64 100644
--- a/data/json/CharacterSkinDefinition/18.json
+++ b/data/json/CharacterSkinDefinition/18.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Chacha Gris",
+  "m_displayName": "PNJ - BONTA - Chacha Gris",
   "m_availability": 3,
   "m_i18nNameId": 21321,
   "m_i18nDescriptionId": 14588,
diff --git a/data/json/CharacterSkinDefinition/1803.json b/data/json/CharacterSkinDefinition/1803.json
index c81dfe0f3babe385a2a8148ff0becb5024cc5794..0f73d562f54d098d03f3c08ac32fdc16ca391f6c 100644
--- a/data/json/CharacterSkinDefinition/1803.json
+++ b/data/json/CharacterSkinDefinition/1803.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1803,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      520,
+      966,
+      389
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Catalysateur Pramium M - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 69258,
   "m_i18nDescriptionId": 37997,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "c0f90ace08ee4162a830fbb238a44807",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1831.json b/data/json/CharacterSkinDefinition/1831.json
index 65cab4157e576db92d16e38f525397742dd54b03..46c5a252d68d406c72ef7e0d13c4b065781b9d0f 100644
--- a/data/json/CharacterSkinDefinition/1831.json
+++ b/data/json/CharacterSkinDefinition/1831.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      403,
+      369,
+      993
+    ]
   },
   "m_displayName": "WEAPON - IOP - Bouvaloir Orok M - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 56051,
   "m_i18nDescriptionId": 79465,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "0f97ac1acc264ebe817fbc93225fe7f5",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1841.json b/data/json/CharacterSkinDefinition/1841.json
index c3d59fb37884ceb902ccaa107beb6503e2cdbbc2..f3f1df0f6ca0166a5eae8864f41c65aa4416fcc7 100644
--- a/data/json/CharacterSkinDefinition/1841.json
+++ b/data/json/CharacterSkinDefinition/1841.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 1841,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      824,
+      233,
+      176
+    ]
   },
   "m_displayName": "WEAPON - CRA - Arc Piven M - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 33974,
   "m_i18nDescriptionId": 37131,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "182a1db050454bf3bfd1389a1cf33db1",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/1853.json b/data/json/CharacterSkinDefinition/1853.json
index 47bc3f381a044d7e5517acd1527b0ea161ff5c11..137b1d0537106f486229641d979a27cec8f4e4b7 100644
--- a/data/json/CharacterSkinDefinition/1853.json
+++ b/data/json/CharacterSkinDefinition/1853.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - BWORK - 3A",
-  "m_availability": 0,
+  "m_displayName": "GARDIEN - BWORK - 2",
+  "m_availability": 2,
   "m_i18nNameId": 38163,
   "m_i18nDescriptionId": 57007,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/19.json b/data/json/CharacterSkinDefinition/19.json
index 6ea44eed09a0e4bd6ad7a798af4a6f48cf36a2c7..5fb333b75e936b86d82b63bb053f215589ddab99 100644
--- a/data/json/CharacterSkinDefinition/19.json
+++ b/data/json/CharacterSkinDefinition/19.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - VAMPYRE - Cerceuil Primordial",
+  "m_displayName": "MONSTRE - VAMPYRE - Cercueil Primordial",
   "m_availability": 0,
   "m_i18nNameId": 2540,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/1943.json b/data/json/CharacterSkinDefinition/1943.json
deleted file mode 100644
index c5947f08f1c58e4e608977f5ab0bc7dc7af7d8bd..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/1943.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "1943",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 1943,
-    "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
-  },
-  "m_displayName": "MECHANISM - XELOR - Xelocube Cosmique",
-  "m_availability": 0,
-  "m_i18nNameId": 50583,
-  "m_i18nDescriptionId": 59006,
-  "assetGuid": "",
-  "m_eventGuid": "",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2066.json b/data/json/CharacterSkinDefinition/2066.json
index 794363734cef8799f9bcd3d9ebd1da766b0c5e99..feae8d17672e6b4e25b7acf35b7e401087b109d5 100644
--- a/data/json/CharacterSkinDefinition/2066.json
+++ b/data/json/CharacterSkinDefinition/2066.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      151,
+      494,
+      145
+    ]
   },
   "m_displayName": "WEAPON - IOP - Glaive Stalaktoss M - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 93799,
   "m_i18nDescriptionId": 36599,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "10c4a73401fb4b9e85418e626629c90a",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2114.json b/data/json/CharacterSkinDefinition/2114.json
index c19d8442e6ce768f26aa270ea0a19a3d7adcce23..c643a3680d7aee6cb452240456aecb59e60e60e5 100644
--- a/data/json/CharacterSkinDefinition/2114.json
+++ b/data/json/CharacterSkinDefinition/2114.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2114,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      165,
+      685,
+      611
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Regulant Gurpapa M - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 18944,
   "m_i18nDescriptionId": 91852,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "07109dd91c314ffcb96962b73d83cd1b",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2192.json b/data/json/CharacterSkinDefinition/2192.json
index 11147c90a536b192ecde9a0998ba9af78bc07028..8b35c523fb2d5d3d8e1d96b4340cc4baa1c77faa 100644
--- a/data/json/CharacterSkinDefinition/2192.json
+++ b/data/json/CharacterSkinDefinition/2192.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2192,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      165,
+      685,
+      611
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Regulant Gurpapa M - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 96024,
   "m_i18nDescriptionId": 2962,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "07109dd91c314ffcb96962b73d83cd1b",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/220.json b/data/json/CharacterSkinDefinition/220.json
index 8da24960b310bc50ccf6e06dc6ba2f60464571e4..4dd55ceeeddb46315ac9ce6a2334a3e813cd7900 100644
--- a/data/json/CharacterSkinDefinition/220.json
+++ b/data/json/CharacterSkinDefinition/220.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN PIRA\u0027BWORK - Larbin Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 46490,
   "m_i18nDescriptionId": 19921,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2206.json b/data/json/CharacterSkinDefinition/2206.json
index 9e431bb4ffaefb07d11ee2d80887c30a2a1393d7..49436482c9c7173540ac60af632d18d5ddc80b97 100644
--- a/data/json/CharacterSkinDefinition/2206.json
+++ b/data/json/CharacterSkinDefinition/2206.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2206,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      460,
+      228,
+      716
+    ]
   },
   "m_displayName": "WEAPON - CRA - Voldorak Vo M - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 2518,
   "m_i18nDescriptionId": 63362,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "c9fb6b07291d42c4b526bf4dc362c952",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2207.json b/data/json/CharacterSkinDefinition/2207.json
index ad6099969c959ab87949d95ac8c2fa883a63cbd3..44a97bf49c91b9f331f38a18aa8fcf37f9ca6706 100644
--- a/data/json/CharacterSkinDefinition/2207.json
+++ b/data/json/CharacterSkinDefinition/2207.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN VOLCANO\u0027CULTE - Larbin Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 57474,
   "m_i18nDescriptionId": 93224,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2237.json b/data/json/CharacterSkinDefinition/2237.json
index 97d2281492419f89e19810aa8b7fe7ab77d9d22c..75310c48833155fee35f62dcad4d3f77050c4b66 100644
--- a/data/json/CharacterSkinDefinition/2237.json
+++ b/data/json/CharacterSkinDefinition/2237.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2237,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      460,
+      228,
+      716
+    ]
   },
   "m_displayName": "WEAPON - CRA - Voldorak Vo M - Skin 01",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 29347,
   "m_i18nDescriptionId": 1530,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "c9fb6b07291d42c4b526bf4dc362c952",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2243.json b/data/json/CharacterSkinDefinition/2243.json
index 774e85ad93f3960b082e62071581919ed470908d..d97d228d5f200d10bfc192db83d01e6578d0168b 100644
--- a/data/json/CharacterSkinDefinition/2243.json
+++ b/data/json/CharacterSkinDefinition/2243.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2243,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      719,
+      587,
+      825
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Catalysateur Pramium F - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 59586,
   "m_i18nDescriptionId": 5635,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "953f34b6ac3048ea907a96b3ea7fbea5",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2338.json b/data/json/CharacterSkinDefinition/2338.json
index d9151c2c28f1537797dda619835c170e32c9a8a1..fa6d150265fe2d484373f995e76f62b0508ad570 100644
--- a/data/json/CharacterSkinDefinition/2338.json
+++ b/data/json/CharacterSkinDefinition/2338.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2338,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      719,
+      587,
+      825
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Catalysateur Pramium F - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 17233,
   "m_i18nDescriptionId": 64183,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "953f34b6ac3048ea907a96b3ea7fbea5",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2360.json b/data/json/CharacterSkinDefinition/2360.json
index 5f1ed3d95056238cdac4f06c155ffec2e474ac14..f8e84c17f21ed6ed6f1237b1a4b77dc71cd2cc5d 100644
--- a/data/json/CharacterSkinDefinition/2360.json
+++ b/data/json/CharacterSkinDefinition/2360.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - POULPE - BOGDAPOULPE",
+  "m_availability": 3,
   "m_i18nNameId": 41635,
   "m_i18nDescriptionId": 3290,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/237.json b/data/json/CharacterSkinDefinition/237.json
index f7d8501edbcf3ecd466d83cc3305984a80466c7a..73747d0b69c6e612310b4e11784fdea165475f78 100644
--- a/data/json/CharacterSkinDefinition/237.json
+++ b/data/json/CharacterSkinDefinition/237.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Krouktos",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Blockmort Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 34222,
   "m_i18nDescriptionId": 97797,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2432.json b/data/json/CharacterSkinDefinition/2432.json
index c71d390a14bc40c2d0c66a309a7773527d9b6971..93eba727119d1ededc6552ea7be3d276c6ea2b05 100644
--- a/data/json/CharacterSkinDefinition/2432.json
+++ b/data/json/CharacterSkinDefinition/2432.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2432,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      262,
+      57,
+      216
+    ]
   },
   "m_displayName": "WEAPON - CRA - Shiru Shaden F - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 97769,
   "m_i18nDescriptionId": 78900,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "512c1a5e0ceb4158a33ad3494f9bc6bc",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2449.json b/data/json/CharacterSkinDefinition/2449.json
index f0ef45183532c2bdbafc3d606fbad45ca0f2287e..c50b6b8a2cbbbfe210f98c3be3c0151330348598 100644
--- a/data/json/CharacterSkinDefinition/2449.json
+++ b/data/json/CharacterSkinDefinition/2449.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2449,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      914,
+      182,
+      346
+    ]
   },
   "m_displayName": "WEAPON - CRA - Bunelame F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 46439,
   "m_i18nDescriptionId": 55484,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "b3dae84959464026bdafcda78d58c82d",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2556.json b/data/json/CharacterSkinDefinition/2556.json
index bd295a5d6c5e529c43d7a0949ffef8f79f8b52d0..73fd0a1079d7e9cba3121a4c9689d5c13c696c84 100644
--- a/data/json/CharacterSkinDefinition/2556.json
+++ b/data/json/CharacterSkinDefinition/2556.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "PNJ - HAVRE-ILE - Livre Shushu",
+  "m_availability": 3,
   "m_i18nNameId": 52882,
   "m_i18nDescriptionId": 95398,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2654.json b/data/json/CharacterSkinDefinition/2654.json
index 817a2fd452abd9e890cffe8f22887bb5d89ccda2..79193aa494fb5de277936e7887bd844b09843e8f 100644
--- a/data/json/CharacterSkinDefinition/2654.json
+++ b/data/json/CharacterSkinDefinition/2654.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - POULPE - POULPANOV",
+  "m_availability": 3,
   "m_i18nNameId": 95763,
   "m_i18nDescriptionId": 1283,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2692.json b/data/json/CharacterSkinDefinition/2692.json
index aa12f25b64d4a7e3fa63ffc8124ad894d411a831..91d575e6fb43d6ee75d3d585327a7d12ca290e5b 100644
--- a/data/json/CharacterSkinDefinition/2692.json
+++ b/data/json/CharacterSkinDefinition/2692.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2692,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      213,
+      288,
+      452
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Sabliaton Jikan M - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 42230,
   "m_i18nDescriptionId": 32668,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "974509d18b62472584bd0f7fe84e53b3",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2742.json b/data/json/CharacterSkinDefinition/2742.json
index 54b6840ef87a6a737d5f7d52f4d9304f16aa46ba..1eb272668146f31a2b8cbfdc00717a3018ea8dce 100644
--- a/data/json/CharacterSkinDefinition/2742.json
+++ b/data/json/CharacterSkinDefinition/2742.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - NINJA - Grouyu Hayabusa",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Instructeur Cochon Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 98409,
   "m_i18nDescriptionId": 29105,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2754.json b/data/json/CharacterSkinDefinition/2754.json
index 32cbfd0aeea6bfaa4e52b1d715006958445cc82a..0ec27bffe576a7476ea39adb7044bc15f2f7db58 100644
--- a/data/json/CharacterSkinDefinition/2754.json
+++ b/data/json/CharacterSkinDefinition/2754.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - BWORK - 1B",
-  "m_availability": 0,
+  "m_displayName": "GARDIEN - CHAFER - Comte Doutro Tombo",
+  "m_availability": 2,
   "m_i18nNameId": 63503,
   "m_i18nDescriptionId": 26522,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2876.json b/data/json/CharacterSkinDefinition/2876.json
index f7fb4bef085b3e96728d558f9b8df58976d23b4a..c2bfede9adbb4b81692e76a459c23fbf4fda73d0 100644
--- a/data/json/CharacterSkinDefinition/2876.json
+++ b/data/json/CharacterSkinDefinition/2876.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Gralex Lelarge",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Coppa le Copain Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 59872,
   "m_i18nDescriptionId": 79647,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2881.json b/data/json/CharacterSkinDefinition/2881.json
index f6002edaaab0e2607b193352f4a8900ef723cc4d..fa03fca664537edde99066277c29808f5389dea5 100644
--- a/data/json/CharacterSkinDefinition/2881.json
+++ b/data/json/CharacterSkinDefinition/2881.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - SURIN - Kiro",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - SURIN - Arbatarba Surin",
+  "m_availability": 3,
   "m_i18nNameId": 99161,
   "m_i18nDescriptionId": 56677,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2889.json b/data/json/CharacterSkinDefinition/2889.json
index d47123700919774fd90926ab833d0a3d019f8193..5f1b679240783844b24d149626e1255e95edc44a 100644
--- a/data/json/CharacterSkinDefinition/2889.json
+++ b/data/json/CharacterSkinDefinition/2889.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 2889,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      162,
+      125,
+      100
+    ]
   },
   "m_displayName": "WEAPON - CRA - Bunelame M - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 79781,
   "m_i18nDescriptionId": 71252,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "980d629f6ede43cf99f4412ad231e77c",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/2938.json b/data/json/CharacterSkinDefinition/2938.json
index 60359e9804dc706b869526e71aa5746c4a3d2bd5..9be735d7050efd78cf742b113501c913ad5ccda5 100644
--- a/data/json/CharacterSkinDefinition/2938.json
+++ b/data/json/CharacterSkinDefinition/2938.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - SURIN - Bardos Le Désosseur",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - SURIN - Blockmort Surin",
+  "m_availability": 3,
   "m_i18nNameId": 12198,
   "m_i18nDescriptionId": 73544,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2951.json b/data/json/CharacterSkinDefinition/2951.json
index 3ba0cace4d26448cc22dc641d28e97cdc18b2d40..265ac9ea67482179916d1af420fa2d184d65482f 100644
--- a/data/json/CharacterSkinDefinition/2951.json
+++ b/data/json/CharacterSkinDefinition/2951.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Primordiaux M",
+  "m_displayName": "MONSTRE - VAMPYRE - Primordial M",
   "m_availability": 0,
   "m_i18nNameId": 99351,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/298.json b/data/json/CharacterSkinDefinition/298.json
index e50b661fe28fb9b87ed8cc6c3f04f78aec82dc3d..6b0cc5f98702c95ea7e9ccab394c5baf803f6f6a 100644
--- a/data/json/CharacterSkinDefinition/298.json
+++ b/data/json/CharacterSkinDefinition/298.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - PARLE-LAVE - CLAN VOLCANO",
+  "m_availability": 3,
   "m_i18nNameId": 85624,
   "m_i18nDescriptionId": 41485,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/2985.json b/data/json/CharacterSkinDefinition/2985.json
index c149532b3124ba87ede4c701e4253d63558b7c98..4ddfb9d3ea91873e4a284e94c58aef2ffecb5476 100644
--- a/data/json/CharacterSkinDefinition/2985.json
+++ b/data/json/CharacterSkinDefinition/2985.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "PNJ - MARCHAND - BWORK - Marchand 2 A",
+  "m_displayName": "PNJ - MARCHAND - BWORK - Ecaprifon A",
   "m_availability": 2,
   "m_i18nNameId": 94796,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/3013.json b/data/json/CharacterSkinDefinition/3013.json
index 6bd0135ae6afcae7b9ae846761ff0c7e2f609fa7..cf3e72f33c6817321cc23119bfc9de228e9d6c3b 100644
--- a/data/json/CharacterSkinDefinition/3013.json
+++ b/data/json/CharacterSkinDefinition/3013.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 3013,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      691,
+      197,
+      637
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Regulant Gurpapa F - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 79484,
   "m_i18nDescriptionId": 55754,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "c71e2be538b7465aa94bd7710b433f3e",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/3045.json b/data/json/CharacterSkinDefinition/3045.json
index b1d0aec60d6bf394778ed003cab9ffb16409f1e1..7383c1fbb274c9278d72ce76c7dd3959c5c65a95 100644
--- a/data/json/CharacterSkinDefinition/3045.json
+++ b/data/json/CharacterSkinDefinition/3045.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "CRA - Ombre Glacée M",
-  "m_availability": 3,
+  "m_availability": 0,
   "m_i18nNameId": 64704,
   "m_i18nDescriptionId": 0,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3103.json b/data/json/CharacterSkinDefinition/3103.json
index 3400a9f9ac7a9eddaae1fc0103691e55af2176ae..dc03fea6f6c95badb335c61318a1eae239f9ddc2 100644
--- a/data/json/CharacterSkinDefinition/3103.json
+++ b/data/json/CharacterSkinDefinition/3103.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Base F",
+  "m_displayName": "MONSTRE - VAMPYRE - Base F",
   "m_availability": 0,
   "m_i18nNameId": 47529,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/3115.json b/data/json/CharacterSkinDefinition/3115.json
index 019c53a80e5bbe001d614e8429e6cb09f301c74c..29552f8477870d33eaee1a8c30f8fcb8010b8930 100644
--- a/data/json/CharacterSkinDefinition/3115.json
+++ b/data/json/CharacterSkinDefinition/3115.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Castresse la Frigide",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Châtreuse Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 60054,
   "m_i18nDescriptionId": 24056,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/32.json b/data/json/CharacterSkinDefinition/32.json
deleted file mode 100644
index 762a960171fbc7c6d988dde50885cfa3216033c2..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/32.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "32",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 32,
-    "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
-  },
-  "m_displayName": "MECHANISM - XELOR - Xelocube Volcanique",
-  "m_availability": 0,
-  "m_i18nNameId": 24271,
-  "m_i18nDescriptionId": 38934,
-  "assetGuid": "",
-  "m_eventGuid": "",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/322.json b/data/json/CharacterSkinDefinition/322.json
index 806aaa3b004bec54f5b4fc7e3a6a5fb050e2a52a..93dc6fba130427028eee0a3c8d20e78054d08fa5 100644
--- a/data/json/CharacterSkinDefinition/322.json
+++ b/data/json/CharacterSkinDefinition/322.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Gnokoss",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Proctoss Picaross",
+  "m_availability": 3,
   "m_i18nNameId": 69313,
   "m_i18nDescriptionId": 75097,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3224.json b/data/json/CharacterSkinDefinition/3224.json
index 876526d21f80d71888308840cca5f8a28a3aaaf1..0439783fc14ee9a46d952f5142fb9d222e7cebb2 100644
--- a/data/json/CharacterSkinDefinition/3224.json
+++ b/data/json/CharacterSkinDefinition/3224.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 3224,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      691,
+      197,
+      637
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Regulant Gurpapa F - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 86534,
   "m_i18nDescriptionId": 85592,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "c71e2be538b7465aa94bd7710b433f3e",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/3289.json b/data/json/CharacterSkinDefinition/3289.json
index fa17a87b3ba6627d86a9eb31d3edb617c15034e3..8ddcf9d1637315d531f2e3643b64eb39dd4987c4 100644
--- a/data/json/CharacterSkinDefinition/3289.json
+++ b/data/json/CharacterSkinDefinition/3289.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Soldat Lancier",
+  "m_displayName": "PNJ - BONTA - Soldat Lancier",
   "m_availability": 3,
   "m_i18nNameId": 91801,
   "m_i18nDescriptionId": 64579,
diff --git a/data/json/CharacterSkinDefinition/3442.json b/data/json/CharacterSkinDefinition/3442.json
index a4d316d2423c41c85a0c539e0c8d907c67ec6749..7996b74c36008972e3dacee34f20bc64c35d2fd9 100644
--- a/data/json/CharacterSkinDefinition/3442.json
+++ b/data/json/CharacterSkinDefinition/3442.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Psychokinese",
+  "m_displayName": "MONSTRE - VAMPYRE - Psychokinese",
   "m_availability": 0,
   "m_i18nNameId": 35842,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/3459.json b/data/json/CharacterSkinDefinition/3459.json
index 159bfbc980091b254203b037f92db286d186f9c2..6536741434d4369c806effed69a728ce55e8503a 100644
--- a/data/json/CharacterSkinDefinition/3459.json
+++ b/data/json/CharacterSkinDefinition/3459.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "SUMMONING - RING - (Ploutrozaurus)",
-  "m_availability": 0,
+  "m_displayName": "SUMMONING - RING - Ploutrozorus",
+  "m_availability": 3,
   "m_i18nNameId": 87012,
   "m_i18nDescriptionId": 80323,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3465.json b/data/json/CharacterSkinDefinition/3465.json
index 01718ee8e02b7a29559859f3267297bbe2225028..2d9f4b94e77125f91e0c9e1f7dde06b4c97df161 100644
--- a/data/json/CharacterSkinDefinition/3465.json
+++ b/data/json/CharacterSkinDefinition/3465.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Soldat Guerrier",
+  "m_displayName": "PNJ - BONTA - Soldat Guerrier",
   "m_availability": 3,
   "m_i18nNameId": 17057,
   "m_i18nDescriptionId": 66431,
diff --git a/data/json/CharacterSkinDefinition/3523.json b/data/json/CharacterSkinDefinition/3523.json
index 173aec17735371586a7622b9acc7f22b30f8b5e6..431fe9c4db6ab8bc9b92315a2e1f04b110c8d70b 100644
--- a/data/json/CharacterSkinDefinition/3523.json
+++ b/data/json/CharacterSkinDefinition/3523.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN VOLCANO\u0027CULTE - Traqueur Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 64605,
   "m_i18nDescriptionId": 56497,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3582.json b/data/json/CharacterSkinDefinition/3582.json
index 14acf6ada675b4f925260d4f8b872af0ea517ab3..8a2725226b4af1a081dd6a4c08db17a58a265608 100644
--- a/data/json/CharacterSkinDefinition/3582.json
+++ b/data/json/CharacterSkinDefinition/3582.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "CRA - Ombre Glacée F",
-  "m_availability": 3,
+  "m_availability": 0,
   "m_i18nNameId": 53668,
   "m_i18nDescriptionId": 0,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3601.json b/data/json/CharacterSkinDefinition/3601.json
index 7b4c6aa753228840834e0b92a7194e9315cdd45e..6f5e8c67226237c0ed86f4f70851b7ad732a4f0b 100644
--- a/data/json/CharacterSkinDefinition/3601.json
+++ b/data/json/CharacterSkinDefinition/3601.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - XELOR - Xelocube Solaire",
+  "m_availability": 3,
   "m_i18nNameId": 39921,
   "m_i18nDescriptionId": 78492,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3636.json b/data/json/CharacterSkinDefinition/3636.json
index cd633157bfbecd86bdac9ba56b9470151a088e0c..389c4916772c2546460f62f012b3cd81daa89cb8 100644
--- a/data/json/CharacterSkinDefinition/3636.json
+++ b/data/json/CharacterSkinDefinition/3636.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "PNJ - Bonta",
+  "m_displayName": "NPC - BONTA - Soldat Mage Bleu",
   "m_availability": 2,
   "m_i18nNameId": 14523,
   "m_i18nDescriptionId": 43771,
diff --git a/data/json/CharacterSkinDefinition/368.json b/data/json/CharacterSkinDefinition/368.json
index 84d19e04059f7b38b6807dc40432be1a95d08cd1..470bc4599b1b0ef77e60b102ff07614fd94f7b11 100644
--- a/data/json/CharacterSkinDefinition/368.json
+++ b/data/json/CharacterSkinDefinition/368.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - BWORK - CLAN PIRA\u0027BWORK - Bwork Parle-Lave Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 34998,
   "m_i18nDescriptionId": 52241,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3720.json b/data/json/CharacterSkinDefinition/3720.json
index 9f2e7a231cb23da359596437ef3a780008f4383f..a09b30bad19ee5b8a3726c3c751502474eaf2b9e 100644
--- a/data/json/CharacterSkinDefinition/3720.json
+++ b/data/json/CharacterSkinDefinition/3720.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Pigsaw",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Soldat Tripoux Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 85493,
   "m_i18nDescriptionId": 13042,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3732.json b/data/json/CharacterSkinDefinition/3732.json
index 7a63251ca20d328872e220a16c66cc365e400885..cbcd07a6cc0f229a274dc96bf7619e3f22b0f6ee 100644
--- a/data/json/CharacterSkinDefinition/3732.json
+++ b/data/json/CharacterSkinDefinition/3732.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Grannie Wilkes",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Mortadella Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 53677,
   "m_i18nDescriptionId": 3430,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3778.json b/data/json/CharacterSkinDefinition/3778.json
index ace68f1d14d73bd9c835532cf56b9a0ee55e454f..0a9a775d37d13c1dbb22258cc0008af4e9395dd5 100644
--- a/data/json/CharacterSkinDefinition/3778.json
+++ b/data/json/CharacterSkinDefinition/3778.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Base M",
+  "m_displayName": "MONSTRE - VAMPYRE - Base M",
   "m_availability": 0,
   "m_i18nNameId": 94473,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/3834.json b/data/json/CharacterSkinDefinition/3834.json
index edfc9f4347afa740a2b5a9f58ed2ed5da76ef78a..75ecd1245823b7d3c7bd107efe5fcb943a11d2e1 100644
--- a/data/json/CharacterSkinDefinition/3834.json
+++ b/data/json/CharacterSkinDefinition/3834.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Carnibal Lecter",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Graton Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 33638,
   "m_i18nDescriptionId": 57220,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3837.json b/data/json/CharacterSkinDefinition/3837.json
index 5d54fd38549adfa382a1ee056032cb44f554101e..fa5cd63681c065a54477d5a8e9a12cb3e688cd4b 100644
--- a/data/json/CharacterSkinDefinition/3837.json
+++ b/data/json/CharacterSkinDefinition/3837.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - XELOR - Xelocube Volcanique",
+  "m_availability": 3,
   "m_i18nNameId": 38382,
   "m_i18nDescriptionId": 55391,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3839.json b/data/json/CharacterSkinDefinition/3839.json
index d74d70351a243a9d25d0f4f41150f581c84377f3..f9c5d88416acd865b89aeaf480d91a2b163cbafe 100644
--- a/data/json/CharacterSkinDefinition/3839.json
+++ b/data/json/CharacterSkinDefinition/3839.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - XELOR - Xelocube Vide",
+  "m_availability": 3,
   "m_i18nNameId": 5082,
   "m_i18nDescriptionId": 91762,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/3847.json b/data/json/CharacterSkinDefinition/3847.json
index 3f6fd16df36201a3abe5a33df4cc76c1bafbc1c2..a346c7c437025f1178eb6d14b0a5a38d7a44b215 100644
--- a/data/json/CharacterSkinDefinition/3847.json
+++ b/data/json/CharacterSkinDefinition/3847.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "PNJ - Bonta",
+  "m_displayName": "NPC - BONTA - Soldat Mage Blanc",
   "m_availability": 2,
   "m_i18nNameId": 4617,
   "m_i18nDescriptionId": 66705,
diff --git a/data/json/CharacterSkinDefinition/3849.json b/data/json/CharacterSkinDefinition/3849.json
index 7ed3e74764ec3976ff658f263022b3142256bf7f..4bee69c19f673a12baa75bc7e3442fc44e9b8de7 100644
--- a/data/json/CharacterSkinDefinition/3849.json
+++ b/data/json/CharacterSkinDefinition/3849.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Borden le Prestigieux",
+  "m_displayName": "PNJ - BONTA - Borden le Prestigieux",
   "m_availability": 3,
   "m_i18nNameId": 87990,
   "m_i18nDescriptionId": 26429,
diff --git a/data/json/CharacterSkinDefinition/3990.json b/data/json/CharacterSkinDefinition/3990.json
index d6057433604844a108176337cc37f6166bc21963..2c4f5c67fa22710fca39156b3a552f2a5b3815a3 100644
--- a/data/json/CharacterSkinDefinition/3990.json
+++ b/data/json/CharacterSkinDefinition/3990.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Porman Bates",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Instructeur Cochon Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 62663,
   "m_i18nDescriptionId": 75655,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/4007.json b/data/json/CharacterSkinDefinition/4007.json
index 1048e9f67896cc87035e96466d0149d8b810646a..3317bf720bda40b8c7229c3858349c1b3bd2470b 100644
--- a/data/json/CharacterSkinDefinition/4007.json
+++ b/data/json/CharacterSkinDefinition/4007.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 4007,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      272,
+      334,
+      131
+    ]
   },
   "m_displayName": "WEAPON - CRA - Voldorak Vo F - Skin 01",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 23,
   "m_i18nDescriptionId": 62415,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "ae46815d4a1147b8b03f1754dfbe19c6",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4033.json b/data/json/CharacterSkinDefinition/4033.json
index db32e152a82983e2d31516239dc49ad77a550fa9..9976cb5d276a69f9700e578c3aabb227c493db0d 100644
--- a/data/json/CharacterSkinDefinition/4033.json
+++ b/data/json/CharacterSkinDefinition/4033.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      147,
+      222,
+      652
+    ]
   },
   "m_displayName": "WEAPON - IOP - Bouvaloir Orok F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 32137,
   "m_i18nDescriptionId": 25591,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "e836a6bb006d4259823482da6ca4cd45",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4068.json b/data/json/CharacterSkinDefinition/4068.json
index 570b8f43bde83ae22451e6e917708e12199e12b8..07c85f2784aa24e1d0f011e7cd940da602b1966c 100644
--- a/data/json/CharacterSkinDefinition/4068.json
+++ b/data/json/CharacterSkinDefinition/4068.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 4068,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      609,
+      675,
+      359
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Synchronisateur Tako F - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 78907,
   "m_i18nDescriptionId": 89214,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "f1525cf1a16d412f9eae74f98cd2a583",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4239.json b/data/json/CharacterSkinDefinition/4239.json
index 45a26282f5a5826123745f61b2351389600c5e76..52a3c578d3e1ec57aca71553b840ed1c447ba821 100644
--- a/data/json/CharacterSkinDefinition/4239.json
+++ b/data/json/CharacterSkinDefinition/4239.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - VAMPYRE - Cerceuil Métapsychique",
+  "m_displayName": "MONSTRE - VAMPYRE - Cercueil Base",
   "m_availability": 0,
   "m_i18nNameId": 27701,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/4316.json b/data/json/CharacterSkinDefinition/4316.json
index f42868f26e9da097c959a7341731cf7e837fcd90..a1faf6a8fa994fb26c06c0d2ae9b7d195a5f92a4 100644
--- a/data/json/CharacterSkinDefinition/4316.json
+++ b/data/json/CharacterSkinDefinition/4316.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      237,
+      101,
+      555
+    ]
   },
   "m_displayName": "WEAPON - IOP - Lamarguedon Spectral M - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 91183,
   "m_i18nDescriptionId": 99352,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "64180c6f5b344cfc968e07d622d6b9bf",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4464.json b/data/json/CharacterSkinDefinition/4464.json
index 09986f5c793a74073ecbd28200776e2cf9c04a32..e536b3568523cd729dcc9b8d59e2e0001869d03a 100644
--- a/data/json/CharacterSkinDefinition/4464.json
+++ b/data/json/CharacterSkinDefinition/4464.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - CRABE - KRABKEN",
+  "m_availability": 3,
   "m_i18nNameId": 90093,
   "m_i18nDescriptionId": 97081,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/4468.json b/data/json/CharacterSkinDefinition/4468.json
index b17f05230a40f92d0f3aa8f6f2aca9a3084719d6..44ec7da3ded84b52f9bc1b8488b1d6cf80c00111 100644
--- a/data/json/CharacterSkinDefinition/4468.json
+++ b/data/json/CharacterSkinDefinition/4468.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Freddy Grouiger",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Disciple Cochonnet Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 10933,
   "m_i18nDescriptionId": 89032,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/4469.json b/data/json/CharacterSkinDefinition/4469.json
index e46aaa42b7e118e6e3b4d384a3809284a9497316..ae9feff0f5769bb5661ff35579df5830e99258b8 100644
--- a/data/json/CharacterSkinDefinition/4469.json
+++ b/data/json/CharacterSkinDefinition/4469.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 4469,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      914,
+      182,
+      346
+    ]
   },
   "m_displayName": "WEAPON - CRA - Bunelame F - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 50775,
   "m_i18nDescriptionId": 79098,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "b3dae84959464026bdafcda78d58c82d",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4477.json b/data/json/CharacterSkinDefinition/4477.json
deleted file mode 100644
index afb3ed50d6d0aac4dbb0147c8c004add8d53bb91..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/4477.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4477",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 4477,
-    "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
-  },
-  "m_displayName": "PNJ - MARCHAND - BWORK - Ecafripon 1",
-  "m_availability": 2,
-  "m_i18nNameId": 42122,
-  "m_i18nDescriptionId": 0,
-  "assetGuid": "",
-  "m_eventGuid": "",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4515.json b/data/json/CharacterSkinDefinition/4515.json
index bd7a9fad6429c67c8aa02d5d018854f17831eccd..007d9a5d43329305026a029485f02fa795389010 100644
--- a/data/json/CharacterSkinDefinition/4515.json
+++ b/data/json/CharacterSkinDefinition/4515.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
-  "m_availability": 0,
+  "m_displayName": "SUMMONING - RING - Tofu Rose",
+  "m_availability": 2,
   "m_i18nNameId": 66482,
   "m_i18nDescriptionId": 0,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/4555.json b/data/json/CharacterSkinDefinition/4555.json
deleted file mode 100644
index 0fa7533b5b18e42a810d9f9cd09649887ce0412f..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/4555.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4555",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 4555,
-    "rarity": 0,
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 2,
-        "amount": 500
-      }
-    ],
-    "gender": 2,
-    "defaultEmotes": [
-      147,
-      222,
-      652
-    ]
-  },
-  "m_displayName": "WEAPON - IOP - Bouvaloir Orok F 02",
-  "m_availability": 3,
-  "m_i18nNameId": 30763,
-  "m_i18nDescriptionId": 5651,
-  "assetGuid": "a1aaf1316ed51454b8c831020b33c785",
-  "m_eventGuid": "e836a6bb006d4259823482da6ca4cd45",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4567.json b/data/json/CharacterSkinDefinition/4567.json
index 9096312b60137f757dcd78a2ae34f460632e0942..3d6f141cb1532ae8751da6cfa4f13d9b2cdc1980 100644
--- a/data/json/CharacterSkinDefinition/4567.json
+++ b/data/json/CharacterSkinDefinition/4567.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
+  "m_displayName": "MONSTRE - VAMPYRE - Chauve-Souris Base M",
   "m_availability": 0,
   "m_i18nNameId": 72837,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/4591.json b/data/json/CharacterSkinDefinition/4591.json
index 15a8ee7c9517debcaba1264fdee1ac75630203df..53f25914b631c3d52fc551772691b5091c8cf624 100644
--- a/data/json/CharacterSkinDefinition/4591.json
+++ b/data/json/CharacterSkinDefinition/4591.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - VAMPYRE - Cerceuil de Base",
+  "m_displayName": "MONSTRE - VAMPYRE - Cercueil Mineur",
   "m_availability": 0,
   "m_i18nNameId": 36119,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/4743.json b/data/json/CharacterSkinDefinition/4743.json
index 00144488ca3cd761ac13ccd3d7e3d6641504df55..a789a343ed46ee1a257cb03fb0331a67b1a9443d 100644
--- a/data/json/CharacterSkinDefinition/4743.json
+++ b/data/json/CharacterSkinDefinition/4743.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Soldat Archer",
+  "m_displayName": "PNJ - BONTA - Soldat Archer",
   "m_availability": 3,
   "m_i18nNameId": 44880,
   "m_i18nDescriptionId": 21984,
diff --git a/data/json/CharacterSkinDefinition/4809.json b/data/json/CharacterSkinDefinition/4809.json
index e32ba67c96d0f8c3e6e9ba6ca3741fddf1a0dd89..58e652ef0434f5d9119d5efbc0f2ea8d2450536e 100644
--- a/data/json/CharacterSkinDefinition/4809.json
+++ b/data/json/CharacterSkinDefinition/4809.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      147,
+      222,
+      652
+    ]
   },
   "m_displayName": "WEAPON - IOP - Bouvaloir Orok F - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 1374,
   "m_i18nDescriptionId": 13332,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "e836a6bb006d4259823482da6ca4cd45",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4823.json b/data/json/CharacterSkinDefinition/4823.json
index 569fa6ead7dc45ad3f8986189c70ff662a724d83..215d0ad427f7e3678b69345e93026348a5a9994b 100644
--- a/data/json/CharacterSkinDefinition/4823.json
+++ b/data/json/CharacterSkinDefinition/4823.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
+  "m_displayName": "MONSTRE - VAMPYRE - Chauve-Souris Berseker F",
   "m_availability": 0,
   "m_i18nNameId": 2036,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/4967.json b/data/json/CharacterSkinDefinition/4967.json
index 0b2bc40c8eaa8adaaa9f1ed95adf03c13b525357..4cb5361557cc4acdf984f4842a1f5e45c41322b5 100644
--- a/data/json/CharacterSkinDefinition/4967.json
+++ b/data/json/CharacterSkinDefinition/4967.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK -  CLAN PIRA\u0027BWORK - Traqueur Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 17824,
   "m_i18nDescriptionId": 37569,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/4992.json b/data/json/CharacterSkinDefinition/4992.json
index 9345a160f43dfe5512a35a4bebe3b031f835da6d..ddc4dc6a7b4f94e90a71425b2ed1ce4558293e1d 100644
--- a/data/json/CharacterSkinDefinition/4992.json
+++ b/data/json/CharacterSkinDefinition/4992.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 4992,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      824,
+      233,
+      176
+    ]
   },
   "m_displayName": "WEAPON - CRA - Arc Piven M - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 48835,
   "m_i18nDescriptionId": 33448,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "182a1db050454bf3bfd1389a1cf33db1",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/4999.json b/data/json/CharacterSkinDefinition/4999.json
index f23ab6600e989e1ea9a3505ec39bb3f5fc100859..2a868bb71e655bad519fc444329354a0051bbd74 100644
--- a/data/json/CharacterSkinDefinition/4999.json
+++ b/data/json/CharacterSkinDefinition/4999.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "WEAPON - ENIRIPSA - Ambre Tamashi F - Skin 01",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 38999,
   "m_i18nDescriptionId": 25829,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5039.json b/data/json/CharacterSkinDefinition/5039.json
index 252d28007a377ba0db44d3df482c56cec2a91dfc..bf0e34bfe73776b1674533bf0b4a93a9bff6538b 100644
--- a/data/json/CharacterSkinDefinition/5039.json
+++ b/data/json/CharacterSkinDefinition/5039.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - BWORKOKAK - CLAN VOLCANO",
+  "m_availability": 3,
   "m_i18nNameId": 54754,
   "m_i18nDescriptionId": 60239,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5065.json b/data/json/CharacterSkinDefinition/5065.json
index 9d55c467aca38d49151f848c289557a0cbca47bc..ef043a129db343ba811047f3c21543f049522393 100644
--- a/data/json/CharacterSkinDefinition/5065.json
+++ b/data/json/CharacterSkinDefinition/5065.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "GARDIEN - CHAFER - SURIN - Liche Horrorthon",
-  "m_availability": 2,
+  "m_availability": 0,
   "m_i18nNameId": 9226,
   "m_i18nDescriptionId": 82008,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5096.json b/data/json/CharacterSkinDefinition/5096.json
index 4a63ffd2e9ea23ffc137070f4583242adde0b634..bf28e701eda4020f97b02056dbb9f641472fa643 100644
--- a/data/json/CharacterSkinDefinition/5096.json
+++ b/data/json/CharacterSkinDefinition/5096.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 5096,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      272,
+      334,
+      131
+    ]
   },
   "m_displayName": "WEAPON - CRA - Voldorak Vo F - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 74611,
   "m_i18nDescriptionId": 35656,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "ae46815d4a1147b8b03f1754dfbe19c6",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/5098.json b/data/json/CharacterSkinDefinition/5098.json
index 76bcdbcf9c43325c20fe10318ad55a6c90e2bf08..9c04c07731d9449fbf0a75b6e33efccd7117e755 100644
--- a/data/json/CharacterSkinDefinition/5098.json
+++ b/data/json/CharacterSkinDefinition/5098.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - NINJA - Grouik Smoke",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Graton Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 13299,
   "m_i18nDescriptionId": 91126,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5101.json b/data/json/CharacterSkinDefinition/5101.json
index c9edf1473d0a74e04e4f8e41793b28fd610eac49..522213542219ebbb8d79ccab28a6a9b427c6dbe2 100644
--- a/data/json/CharacterSkinDefinition/5101.json
+++ b/data/json/CharacterSkinDefinition/5101.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      909,
+      890,
+      330
+    ]
   },
   "m_displayName": "WEAPON - IOP - Glaive Stalaktoss F - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 88858,
   "m_i18nDescriptionId": 89211,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "068ac76ad98a433d967ccf31a65a76f2",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/5123.json b/data/json/CharacterSkinDefinition/5123.json
index 69c14dba62cdf498448d26be4d3e3394777e7b95..787d58f231568c37b0a92d551bb039fc484abdc8 100644
--- a/data/json/CharacterSkinDefinition/5123.json
+++ b/data/json/CharacterSkinDefinition/5123.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "WEAPON - ENIRIPSA - Ambre Tamashi F - Skin 02",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 28104,
   "m_i18nDescriptionId": 44353,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5138.json b/data/json/CharacterSkinDefinition/5138.json
index a8351216c409b6b0d48ebd83506326ad31d840b3..56debec834d94d115e430349ec1692ecb7c6700d 100644
--- a/data/json/CharacterSkinDefinition/5138.json
+++ b/data/json/CharacterSkinDefinition/5138.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
+  "m_displayName": "MONSTRE - VAMPYRE - Chauve-Souris Primordiale F",
   "m_availability": 0,
   "m_i18nNameId": 7281,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/5151.json b/data/json/CharacterSkinDefinition/5151.json
index 022508dbe5fb8bacb9501ef5a241b82d66e61f98..a1ad72890320c76a1577a346ac55a87d63ad2c54 100644
--- a/data/json/CharacterSkinDefinition/5151.json
+++ b/data/json/CharacterSkinDefinition/5151.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
+  "m_displayName": "MONSTRE - VAMPYRE - Chauve-Souris Primordiale M",
   "m_availability": 0,
   "m_i18nNameId": 10322,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/5326.json b/data/json/CharacterSkinDefinition/5326.json
index 2d0986e4b3717d099a4fe2d8b8780b192e5a8d56..8f99e3aca78a498a689a34f7870b48e805877c0e 100644
--- a/data/json/CharacterSkinDefinition/5326.json
+++ b/data/json/CharacterSkinDefinition/5326.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "SUMMONING - RING - (Franeau)",
-  "m_availability": 2,
+  "m_displayName": "SUMMONING - RING - Fran\u0027Eau",
+  "m_availability": 3,
   "m_i18nNameId": 29434,
   "m_i18nDescriptionId": 73691,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5417.json b/data/json/CharacterSkinDefinition/5417.json
index 0ec24cdbce1a85fc79b8970f5a5e257f13b981d1..85406a6f5392c6a43b0123a4c8ec0d39ad2a77a5 100644
--- a/data/json/CharacterSkinDefinition/5417.json
+++ b/data/json/CharacterSkinDefinition/5417.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Capitaine ??",
+  "m_displayName": "PNJ - BONTA - Capitaine ??",
   "m_availability": 3,
   "m_i18nNameId": 42378,
   "m_i18nDescriptionId": 73336,
diff --git a/data/json/CharacterSkinDefinition/5431.json b/data/json/CharacterSkinDefinition/5431.json
index 767305cd461fc75f98db16744ec2fc11a24527c3..354d842972387064e041b6d4e72cd5e7397fd811 100644
--- a/data/json/CharacterSkinDefinition/5431.json
+++ b/data/json/CharacterSkinDefinition/5431.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Mineur F",
+  "m_displayName": "MONSTRE - VAMPYRE - Mineur F",
   "m_availability": 0,
   "m_i18nNameId": 9968,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/5483.json b/data/json/CharacterSkinDefinition/5483.json
index ec37faf837acbd19aabeecd12d2db3867fcc86ba..2fbab0d0cd64fe347cff2cd0652e5d31d7f7ea86 100644
--- a/data/json/CharacterSkinDefinition/5483.json
+++ b/data/json/CharacterSkinDefinition/5483.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK -  CLAN PIRA\u0027BWORK - Larbin Monté Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 85900,
   "m_i18nDescriptionId": 56865,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5526.json b/data/json/CharacterSkinDefinition/5526.json
index b3b43e25d1c8186bbbf7b708443e89981bdd7920..28bda9e536f134f0723c127d02d134711d5db4c7 100644
--- a/data/json/CharacterSkinDefinition/5526.json
+++ b/data/json/CharacterSkinDefinition/5526.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      417,
+      814,
+      558
+    ]
   },
   "m_displayName": "WEAPON - IOP - Justelame Brutale F - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 27855,
   "m_i18nDescriptionId": 85793,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "d182369726064939a95242d72d9ae06d",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/553.json b/data/json/CharacterSkinDefinition/553.json
index 8b8c81dba6eef24d5b7341d0c149c0b89f9f2939..7ad5398c3c6bdb96f81962b1d5de0c97d0ef6af4 100644
--- a/data/json/CharacterSkinDefinition/553.json
+++ b/data/json/CharacterSkinDefinition/553.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - QUETE - COCHON - Niels Laren (Bontarien)",
+  "m_displayName": "PNJ - QUETE - COCHON - Niels Laren (Bontarien)",
   "m_availability": 3,
   "m_i18nNameId": 82947,
   "m_i18nDescriptionId": 80493,
diff --git a/data/json/CharacterSkinDefinition/5574.json b/data/json/CharacterSkinDefinition/5574.json
index 5a4ae47ecf98c8934f2624962e4f7aee1b8a8ff9..aac1b96266466a511c24b7b67e4567d75b2548aa 100644
--- a/data/json/CharacterSkinDefinition/5574.json
+++ b/data/json/CharacterSkinDefinition/5574.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      151,
+      494,
+      145
+    ]
   },
   "m_displayName": "WEAPON - IOP - Glaive Stalaktoss M - Skin 01",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 17877,
   "m_i18nDescriptionId": 95145,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "10c4a73401fb4b9e85418e626629c90a",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/5695.json b/data/json/CharacterSkinDefinition/5695.json
index ab91f5093500d99707d985d2b4b9dba5f5a52888..a49e67cbff501d6368cedef09df6916fa3b31306 100644
--- a/data/json/CharacterSkinDefinition/5695.json
+++ b/data/json/CharacterSkinDefinition/5695.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Doya",
+  "m_displayName": "MONSTRE - VAMPYRE - Doya",
   "m_availability": 0,
   "m_i18nNameId": 49496,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/5760.json b/data/json/CharacterSkinDefinition/5760.json
index a822aa0c4e099aabceafdfb216b37c91253c76ef..8c00d6232b12a913fd3b32f4b88b9330df993f60 100644
--- a/data/json/CharacterSkinDefinition/5760.json
+++ b/data/json/CharacterSkinDefinition/5760.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "COMPANION - Serviteur Draconique",
+  "m_displayName": "TRANSFORMATION - COMPANION - Serviteur Draconique",
   "m_availability": 3,
   "m_i18nNameId": 57500,
   "m_i18nDescriptionId": 95277,
diff --git a/data/json/CharacterSkinDefinition/5820.json b/data/json/CharacterSkinDefinition/5820.json
index a517d43c1410c2e4d4c521e6d50ceecc5b9427df..d9a90ffbc620a57fcdaae616cc1e00e266f3a308 100644
--- a/data/json/CharacterSkinDefinition/5820.json
+++ b/data/json/CharacterSkinDefinition/5820.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "SUMMONING - RING - (Muscapol)",
-  "m_availability": 2,
+  "m_displayName": "SUMMONING - RING - Muscapol",
+  "m_availability": 3,
   "m_i18nNameId": 14100,
   "m_i18nDescriptionId": 94811,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5898.json b/data/json/CharacterSkinDefinition/5898.json
index ba56d6bdc5356f607fc7d2b59e1c8629c64f8d13..31409f6a07bd51a0546823c61586f1d3dd5e8c06 100644
--- a/data/json/CharacterSkinDefinition/5898.json
+++ b/data/json/CharacterSkinDefinition/5898.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Marin Popeye",
+  "m_displayName": "PNJ - BONTA - Marin Popeye",
   "m_availability": 3,
   "m_i18nNameId": 93296,
   "m_i18nDescriptionId": 93101,
diff --git a/data/json/CharacterSkinDefinition/5909.json b/data/json/CharacterSkinDefinition/5909.json
index 7f760f06c700c16b3c5dfe3db0e7635cbb04308b..3d2d7fdf6a5931d1e2e69192a25fb562a91feac0 100644
--- a/data/json/CharacterSkinDefinition/5909.json
+++ b/data/json/CharacterSkinDefinition/5909.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Bolos Le Niais",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Crogneur Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 4309,
   "m_i18nDescriptionId": 27647,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/5930.json b/data/json/CharacterSkinDefinition/5930.json
index 13b54c09754f7090337160aad158113933bf20c6..9345214992a1fe7961caac055d74d654a371a870 100644
--- a/data/json/CharacterSkinDefinition/5930.json
+++ b/data/json/CharacterSkinDefinition/5930.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "IOP - Ombre Glacée M",
-  "m_availability": 3,
+  "m_availability": 0,
   "m_i18nNameId": 27472,
   "m_i18nDescriptionId": 0,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6022.json b/data/json/CharacterSkinDefinition/6022.json
index e14dbe9d7bf63d5e727b8ae582e98ba4b9f01479..74177628c6ce7ff321f476ff248b940125fc81d4 100644
--- a/data/json/CharacterSkinDefinition/6022.json
+++ b/data/json/CharacterSkinDefinition/6022.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - BWORK - 1A",
+  "m_displayName": "NPC - BONTA - Caporal Bleusaille",
   "m_availability": 0,
   "m_i18nNameId": 39881,
   "m_i18nDescriptionId": 38470,
diff --git a/data/json/CharacterSkinDefinition/6096.json b/data/json/CharacterSkinDefinition/6096.json
index 879ed40c8e7f3e29599d5a4534f882aa6ebbf7f5..1cd9c9d1c3267468e31990ce3e32e1346ef9fe7e 100644
--- a/data/json/CharacterSkinDefinition/6096.json
+++ b/data/json/CharacterSkinDefinition/6096.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - NINJA - Orochimagrouik",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Double de Guerrier Boudeur Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 61714,
   "m_i18nDescriptionId": 65951,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6202.json b/data/json/CharacterSkinDefinition/6202.json
index f4d54fb0c00b3053f41e1b733b92a5a742d4565b..e8af040369eb27c3aba7b437a8e5056e10d3d80f 100644
--- a/data/json/CharacterSkinDefinition/6202.json
+++ b/data/json/CharacterSkinDefinition/6202.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 6202,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      775,
+      472,
+      23
+    ]
   },
   "m_displayName": "WEAPON - CRA - Shiru Shaden M - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 35761,
   "m_i18nDescriptionId": 98229,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "773f021819e84b41a17cf2a36a07e2a7",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6459.json b/data/json/CharacterSkinDefinition/6459.json
index b03e87fdfb4efadcae71bf7b70cb2a6ee26f9412..9398d76d47e9d4882cde9ee87f6497ff8e0bc024 100644
--- a/data/json/CharacterSkinDefinition/6459.json
+++ b/data/json/CharacterSkinDefinition/6459.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Soldat Marteau",
+  "m_displayName": "PNJ - BONTA - Soldat Marteau",
   "m_availability": 3,
   "m_i18nNameId": 66675,
   "m_i18nDescriptionId": 4251,
diff --git a/data/json/CharacterSkinDefinition/6463.json b/data/json/CharacterSkinDefinition/6463.json
index 40bcf553ef232a9bfa4dd7cc624d91a44b3a6be7..5782820b473862072771f8c711995b338c0e0895 100644
--- a/data/json/CharacterSkinDefinition/6463.json
+++ b/data/json/CharacterSkinDefinition/6463.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN VOLCANO\u0027CULTE - Larbin monté Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 44616,
   "m_i18nDescriptionId": 42733,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6496.json b/data/json/CharacterSkinDefinition/6496.json
index 4c73f1b08fe33a60c217a2a287966117099afc66..79659315b1b7ecf27e3c5118f92da50fe84e4ffa 100644
--- a/data/json/CharacterSkinDefinition/6496.json
+++ b/data/json/CharacterSkinDefinition/6496.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - BWORK - 3B",
-  "m_availability": 0,
+  "m_displayName": "GARDIEN - BWORK - 3",
+  "m_availability": 2,
   "m_i18nNameId": 82372,
   "m_i18nDescriptionId": 91377,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6498.json b/data/json/CharacterSkinDefinition/6498.json
index 6f4c09ad54c328bde31d25fae442c9e18ee19eb7..a3e1e8a85504e9a139bc3f1afd23ac200bddb926 100644
--- a/data/json/CharacterSkinDefinition/6498.json
+++ b/data/json/CharacterSkinDefinition/6498.json
@@ -9,7 +9,7 @@
     "gender": 2,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Capitaine ???",
+  "m_displayName": "PNJ - BONTA - Capitaine ???",
   "m_availability": 3,
   "m_i18nNameId": 64079,
   "m_i18nDescriptionId": 54508,
diff --git a/data/json/CharacterSkinDefinition/6574.json b/data/json/CharacterSkinDefinition/6574.json
index 252c5988d7f5b8dcccdf8c80c2aef21db9585d67..5fe7ccd540b65b3169c71154c8cf79a539b1a1cb 100644
--- a/data/json/CharacterSkinDefinition/6574.json
+++ b/data/json/CharacterSkinDefinition/6574.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 6574,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      262,
+      57,
+      216
+    ]
   },
   "m_displayName": "WEAPON - CRA - Shiru Shaden F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 99326,
   "m_i18nDescriptionId": 26477,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "512c1a5e0ceb4158a33ad3494f9bc6bc",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6580.json b/data/json/CharacterSkinDefinition/6580.json
index 860807d2f05690698f0ec7c9e38f94f3c89ce974..e3f748fabb2cfb54e4cb6b7b1c5232373a2388dd 100644
--- a/data/json/CharacterSkinDefinition/6580.json
+++ b/data/json/CharacterSkinDefinition/6580.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 6580,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      353,
+      179,
+      805
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Synchronisateur Tako M - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 76392,
   "m_i18nDescriptionId": 8153,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "e06aa4a8984940c6a6d736a92e9a9f0b",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6630.json b/data/json/CharacterSkinDefinition/6630.json
index 301c594a845cf5b145406d5e5db04115a58649ae..f1c1b676fd4259130b13908f49bebda64cc4d90b 100644
--- a/data/json/CharacterSkinDefinition/6630.json
+++ b/data/json/CharacterSkinDefinition/6630.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      296,
+      973,
+      740
+    ]
   },
   "m_displayName": "WEAPON - IOP - Flamboyante Kasai F - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 90600,
   "m_i18nDescriptionId": 9356,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "4fb7ac3f64684c399255f596b7ceb970",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/665.json b/data/json/CharacterSkinDefinition/665.json
index f98fc246d82fefdbf5f6599035632ae26c220cc3..34508028236abe9b9cdc99e10575f83a39f8410e 100644
--- a/data/json/CharacterSkinDefinition/665.json
+++ b/data/json/CharacterSkinDefinition/665.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - BWORK - 2B",
+  "m_displayName": "NPC - BONTA - Joe Fouilletou",
   "m_availability": 0,
   "m_i18nNameId": 17825,
   "m_i18nDescriptionId": 18615,
diff --git a/data/json/CharacterSkinDefinition/6666.json b/data/json/CharacterSkinDefinition/6666.json
index a442a5a9ec348d6c8161dcd62b93bdf5377fb8df..8f21cfcd917e4ac1d32f29576fd736c3e994ecf5 100644
--- a/data/json/CharacterSkinDefinition/6666.json
+++ b/data/json/CharacterSkinDefinition/6666.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "GARDIEN - CHAFER - PIKAROSS - Erog le Profanateur",
-  "m_availability": 2,
+  "m_availability": 0,
   "m_i18nNameId": 61748,
   "m_i18nDescriptionId": 88841,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6712.json b/data/json/CharacterSkinDefinition/6712.json
index 5d1abbab84f4e4795c9c47e1777ff5e5025a8fda..795c39e6ff1a527cdc7fad6e4b46343ab9fdd3d5 100644
--- a/data/json/CharacterSkinDefinition/6712.json
+++ b/data/json/CharacterSkinDefinition/6712.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - NINJA - Yoshigrouitsu",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Soldat Tripoux Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 98091,
   "m_i18nDescriptionId": 91761,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6717.json b/data/json/CharacterSkinDefinition/6717.json
index 38911615ffd597c806735b8ad482b6c8d5d77086..7aac94048b550d1d5e7bbcf109406a8f2f9e5e62 100644
--- a/data/json/CharacterSkinDefinition/6717.json
+++ b/data/json/CharacterSkinDefinition/6717.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Oscargne",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Arbatarba Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 63190,
   "m_i18nDescriptionId": 4966,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/678.json b/data/json/CharacterSkinDefinition/678.json
index 30a2a1461ba34ce706d37d9f439da54acc81e23c..614b8b491dee2ac54e49ccff060b91239ad54302 100644
--- a/data/json/CharacterSkinDefinition/678.json
+++ b/data/json/CharacterSkinDefinition/678.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 678,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      83,
+      55,
+      963
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Aiguille Pikuxala F - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 95652,
   "m_i18nDescriptionId": 89227,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "61957a05ac2846b793ffda94227e5ef6",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6788.json b/data/json/CharacterSkinDefinition/6788.json
index 50b62305af0406f916f36b767901ddfce7701336..9d6a522336111e421356f9e6c16fcf41aa05091a 100644
--- a/data/json/CharacterSkinDefinition/6788.json
+++ b/data/json/CharacterSkinDefinition/6788.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      296,
+      973,
+      740
+    ]
   },
   "m_displayName": "WEAPON - IOP - Flamboyante Kasai F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 20629,
   "m_i18nDescriptionId": 41337,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "4fb7ac3f64684c399255f596b7ceb970",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6790.json b/data/json/CharacterSkinDefinition/6790.json
index 229b0fe6d5abbf23e122804340f2e2a0b89a5079..868fefd823d401670f1fb269d23c0af7c6580831 100644
--- a/data/json/CharacterSkinDefinition/6790.json
+++ b/data/json/CharacterSkinDefinition/6790.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "MONSTRE - CHAFER - SURIN - Evideur",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 34242,
   "m_i18nDescriptionId": 39426,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/6824.json b/data/json/CharacterSkinDefinition/6824.json
index 7bc473f29c089975c39003866513271cb1b0c2bc..e70fd5748231ec9cf933ec028cefc29c7dcf3a9d 100644
--- a/data/json/CharacterSkinDefinition/6824.json
+++ b/data/json/CharacterSkinDefinition/6824.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 6824,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      609,
+      675,
+      359
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Synchronisateur Tako F - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 29964,
   "m_i18nDescriptionId": 94750,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "f1525cf1a16d412f9eae74f98cd2a583",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6845.json b/data/json/CharacterSkinDefinition/6845.json
index 5af4d868a5c1b591a6bc9b79da4d504cc459f337..62c0af1ebe2f0a98d310767ea14bdff6335c762e 100644
--- a/data/json/CharacterSkinDefinition/6845.json
+++ b/data/json/CharacterSkinDefinition/6845.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 6845,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      939,
+      754,
+      178
+    ]
   },
   "m_displayName": "WEAPON - CRA - Expingole M - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 17417,
   "m_i18nDescriptionId": 86715,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "30832bb019f4450f8f7d65766e10859b",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/687.json b/data/json/CharacterSkinDefinition/687.json
index de1a98ee3d27f70166a70db8d955a907aa4ac1f5..b3d29cc3c87bbc79853b6cdf9888e128389bdbd2 100644
--- a/data/json/CharacterSkinDefinition/687.json
+++ b/data/json/CharacterSkinDefinition/687.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 687,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      83,
+      55,
+      963
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Aiguille Pikuxala F - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 52785,
   "m_i18nDescriptionId": 12617,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "61957a05ac2846b793ffda94227e5ef6",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6925.json b/data/json/CharacterSkinDefinition/6925.json
deleted file mode 100644
index eabf66b9e45d6ec313a02db8280c9a85ce088ce6..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/6925.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "6925",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 6925,
-    "rarity": 0,
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 2,
-        "amount": 500
-      }
-    ],
-    "gender": 2,
-    "defaultEmotes": [
-      147,
-      222,
-      652
-    ]
-  },
-  "m_displayName": "WEAPON - IOP - Bouvaloir Orok F 03",
-  "m_availability": 3,
-  "m_i18nNameId": 7159,
-  "m_i18nDescriptionId": 81995,
-  "assetGuid": "a1aaf1316ed51454b8c831020b33c785",
-  "m_eventGuid": "e836a6bb006d4259823482da6ca4cd45",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/6947.json b/data/json/CharacterSkinDefinition/6947.json
index 5dcd8256d38c91703424a7eb1f599d1f4c62ced4..09ff9e42a6df5040095ccd6c3076eee07d839570 100644
--- a/data/json/CharacterSkinDefinition/6947.json
+++ b/data/json/CharacterSkinDefinition/6947.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - NINJA - Shrouidder",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Disciple Cochonnet Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 61674,
   "m_i18nDescriptionId": 11537,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7001.json b/data/json/CharacterSkinDefinition/7001.json
index fa228205afb4852b58422c47eb7d4c1368d27cde..3f63b566cd852f516df2753da2c7f6126d30d1cc 100644
--- a/data/json/CharacterSkinDefinition/7001.json
+++ b/data/json/CharacterSkinDefinition/7001.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 7001,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      213,
+      288,
+      452
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Sabliaton Jikan M - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 48731,
   "m_i18nDescriptionId": 97512,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "974509d18b62472584bd0f7fe84e53b3",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/7097.json b/data/json/CharacterSkinDefinition/7097.json
index 849c4a02128295ae9b7df9b083ee9386d9b655f7..50f863347ad65bad109cfa70b3345b8327a52c15 100644
--- a/data/json/CharacterSkinDefinition/7097.json
+++ b/data/json/CharacterSkinDefinition/7097.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - SURIN - Hocho La Dépeceuse",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - SURIN - Châtreuse surin",
+  "m_availability": 3,
   "m_i18nNameId": 50453,
   "m_i18nDescriptionId": 97667,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7099.json b/data/json/CharacterSkinDefinition/7099.json
index 4060de09c2469aff11237ffa8ac4cde967714e72..4493b8ba56b39a74f5ef45e16cd3c59d4dd0a280 100644
--- a/data/json/CharacterSkinDefinition/7099.json
+++ b/data/json/CharacterSkinDefinition/7099.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - NINJA - Maki Gengrouisai",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Mortadella Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 79331,
   "m_i18nDescriptionId": 8538,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7101.json b/data/json/CharacterSkinDefinition/7101.json
index 6fe2bafb5f6c0493234d2a118cd2f46594ed152b..b8f8821bc502ec707299c117894103e3d3508c76 100644
--- a/data/json/CharacterSkinDefinition/7101.json
+++ b/data/json/CharacterSkinDefinition/7101.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "IOP - Ombre Glacée F",
-  "m_availability": 3,
+  "m_availability": 0,
   "m_i18nNameId": 6046,
   "m_i18nDescriptionId": 0,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7149.json b/data/json/CharacterSkinDefinition/7149.json
index 169c68617577b9e0eaba99a3c2dc2a4ce6229261..8d0e77c95da1e10d694013cd294241846f0654bc 100644
--- a/data/json/CharacterSkinDefinition/7149.json
+++ b/data/json/CharacterSkinDefinition/7149.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - SURIN - Lester",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - SURIN - Avorton Surin",
+  "m_availability": 3,
   "m_i18nNameId": 33570,
   "m_i18nDescriptionId": 2248,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7204.json b/data/json/CharacterSkinDefinition/7204.json
index 5979cebab627de165902e83f2ae5e368dfa15d5a..41c661dad45f147962c692bda3df63fa9950406a 100644
--- a/data/json/CharacterSkinDefinition/7204.json
+++ b/data/json/CharacterSkinDefinition/7204.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Mossaka",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Picoss Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 19378,
   "m_i18nDescriptionId": 52958,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7233.json b/data/json/CharacterSkinDefinition/7233.json
index 673d871b95625c91061745310b705338bc891242..a00c50b5cdd7c1b90754796589eb6e795bb61891 100644
--- a/data/json/CharacterSkinDefinition/7233.json
+++ b/data/json/CharacterSkinDefinition/7233.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Soldat Arbaletrier",
+  "m_displayName": "PNJ - BONTA - Soldat Arbaletrier",
   "m_availability": 3,
   "m_i18nNameId": 99497,
   "m_i18nDescriptionId": 71870,
diff --git a/data/json/CharacterSkinDefinition/7251.json b/data/json/CharacterSkinDefinition/7251.json
index a55b30606b1c5f2f7096fcd3478c92a0a3c54b3c..9c103bced4776802d3a1adc124c36513ab1a3d06 100644
--- a/data/json/CharacterSkinDefinition/7251.json
+++ b/data/json/CharacterSkinDefinition/7251.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Roi Ecorcheur",
+  "m_displayName": "MONSTRE - VAMPYRE - Invocation Sanguine",
   "m_availability": 0,
   "m_i18nNameId": 79324,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/7388.json b/data/json/CharacterSkinDefinition/7388.json
index 6fa84b7afa21dedc2085177303f59b147c982a92..6361d09e09a1077f0931e0e5da341c41a0118d82 100644
--- a/data/json/CharacterSkinDefinition/7388.json
+++ b/data/json/CharacterSkinDefinition/7388.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - CHAFER - Os Gelé",
+  "m_availability": 3,
   "m_i18nNameId": 55798,
   "m_i18nDescriptionId": 11344,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7431.json b/data/json/CharacterSkinDefinition/7431.json
index 09b3c72104106b2348f559d162fe47efa5470f96..e2b3b36cfeaa4997896dbb56f137571a051bc3fd 100644
--- a/data/json/CharacterSkinDefinition/7431.json
+++ b/data/json/CharacterSkinDefinition/7431.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - Ninjadine",
+  "m_displayName": "MONSTRE - COCHON - CLAN NINJA - Coppa le Copain Ninja",
   "m_availability": 3,
   "m_i18nNameId": 6353,
   "m_i18nDescriptionId": 91957,
diff --git a/data/json/CharacterSkinDefinition/7438.json b/data/json/CharacterSkinDefinition/7438.json
index f62001334c1bb897272cd9c5c084aff618c4109b..007d4dbb3007bf4a6807e07e214647e99582ad53 100644
--- a/data/json/CharacterSkinDefinition/7438.json
+++ b/data/json/CharacterSkinDefinition/7438.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "WEAPON - ENIRIPSA - Gemme Déphasante F - Skin 02",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 13672,
   "m_i18nDescriptionId": 89598,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7599.json b/data/json/CharacterSkinDefinition/7599.json
index a08cdde8dd3341f6000c4818f674e7987238a20d..41bd4796b3e89764b43e9453b957336fb3d2019b 100644
--- a/data/json/CharacterSkinDefinition/7599.json
+++ b/data/json/CharacterSkinDefinition/7599.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      605,
+      865,
+      73
+    ]
   },
   "m_displayName": "WEAPON - IOP - Flamboyante Kasai M - Skin 01",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 67793,
   "m_i18nDescriptionId": 40031,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "d9eec74379024fb5a45dd99fbc07a6ca",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/7604.json b/data/json/CharacterSkinDefinition/7604.json
index cd67533b724859b7d150dac6672773ff8a708ff9..41cb01fe89bf841d1d0aa4db236aaf958f0b65b8 100644
--- a/data/json/CharacterSkinDefinition/7604.json
+++ b/data/json/CharacterSkinDefinition/7604.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - XELOR - Xelocube Lunaire",
+  "m_availability": 3,
   "m_i18nNameId": 23372,
   "m_i18nDescriptionId": 37560,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7630.json b/data/json/CharacterSkinDefinition/7630.json
index cf231ed565efe2f76bcd27a15935b615d774e52f..dfedd2ca0b57284eb3dd97334504121a36b58815 100644
--- a/data/json/CharacterSkinDefinition/7630.json
+++ b/data/json/CharacterSkinDefinition/7630.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Avorton",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Avorton Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 81344,
   "m_i18nDescriptionId": 14821,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7631.json b/data/json/CharacterSkinDefinition/7631.json
index a2555795c73ad956a9e1d61fa35541302ed3d23e..b92ffaa9cf565f67afde9ae528f55bfa2036f361 100644
--- a/data/json/CharacterSkinDefinition/7631.json
+++ b/data/json/CharacterSkinDefinition/7631.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - VAMPYRE - Berserk F",
+  "m_displayName": "MONSTRE - VAMPYRE - Berserker F",
   "m_availability": 0,
   "m_i18nNameId": 93796,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/7673.json b/data/json/CharacterSkinDefinition/7673.json
index 89fcd61e70a23a156fa4eb56830b81c578074f99..2931bec947a246eb1ebda070d1fd994e33c85a79 100644
--- a/data/json/CharacterSkinDefinition/7673.json
+++ b/data/json/CharacterSkinDefinition/7673.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - BWORK - 2A",
-  "m_availability": 0,
+  "m_displayName": "GARDIEN - BWORK - 1",
+  "m_availability": 2,
   "m_i18nNameId": 96396,
   "m_i18nDescriptionId": 27207,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7843.json b/data/json/CharacterSkinDefinition/7843.json
index 2543a8470a0019df5a866af99e4f9a0dbb8bc7d2..6a0f90c2cac83867270532ea5244b1f26ec17391 100644
--- a/data/json/CharacterSkinDefinition/7843.json
+++ b/data/json/CharacterSkinDefinition/7843.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      80,
+      423,
+      908
+    ]
   },
   "m_displayName": "WEAPON - IOP - Lamarguedon Spectral F - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 97927,
   "m_i18nDescriptionId": 41312,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "da39ee23c8a342338903fcca0e4858c1",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/7892.json b/data/json/CharacterSkinDefinition/7892.json
index 41d10fc4e77ef9d65a0d825a5a05ff01286af50a..585f73756b39b387dc036062d9592cc34a295fab 100644
--- a/data/json/CharacterSkinDefinition/7892.json
+++ b/data/json/CharacterSkinDefinition/7892.json
@@ -6,11 +6,11 @@
     "id": 7892,
     "rarity": 0,
     "merchantCosts": [],
-    "gender": 1,
+    "gender": 2,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - CLAN PIRA\u0027BWORK - Bworkette Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 35454,
   "m_i18nDescriptionId": 17418,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/7934.json b/data/json/CharacterSkinDefinition/7934.json
index 2007f89c4ade3eb291743cea231d16286f9623f9..bdfd33cb64f467408d088b5fc5d5be96b8bb1bc2 100644
--- a/data/json/CharacterSkinDefinition/7934.json
+++ b/data/json/CharacterSkinDefinition/7934.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Marin Bricole Tonneau",
+  "m_displayName": "PNJ - BONTA - Marin Bricole Tonneau",
   "m_availability": 3,
   "m_i18nNameId": 84696,
   "m_i18nDescriptionId": 24176,
diff --git a/data/json/CharacterSkinDefinition/7975.json b/data/json/CharacterSkinDefinition/7975.json
index 32234f6d41610661299eb4955e3b5fa68e22e5da..e0e28d944789147a8fa262e3231f898668a22344 100644
--- a/data/json/CharacterSkinDefinition/7975.json
+++ b/data/json/CharacterSkinDefinition/7975.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 7975,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      747,
+      254,
+      905
+    ]
   },
   "m_displayName": "WEAPON - CRA - Expingole F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 69950,
   "m_i18nDescriptionId": 43485,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "d52e7bc2d65746a6945e7752152ca190",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/8013.json b/data/json/CharacterSkinDefinition/8013.json
index 9c7051b2df2ede4f3142af0e9d1c4139267218a4..a30e96825fa69bc3d892bb168abe9e5546bb6910 100644
--- a/data/json/CharacterSkinDefinition/8013.json
+++ b/data/json/CharacterSkinDefinition/8013.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - CHAFER - Tas d\u0027Os Surin",
+  "m_availability": 3,
   "m_i18nNameId": 97387,
   "m_i18nDescriptionId": 70069,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/8034.json b/data/json/CharacterSkinDefinition/8034.json
index 5ec15108b19e99a31c7d7173dadf23701967d6a3..cd4b6f42501e8b0e0705b430328279fd886f4820 100644
--- a/data/json/CharacterSkinDefinition/8034.json
+++ b/data/json/CharacterSkinDefinition/8034.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MECHANISM - CHAFER - Tas d\u0027Os Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 98957,
   "m_i18nDescriptionId": 98325,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/8041.json b/data/json/CharacterSkinDefinition/8041.json
index 650c92b660f4f631d867ece9a51d65405abf21b6..b52ddad420be1ca7891fb3b9ee21d645bcc29d10 100644
--- a/data/json/CharacterSkinDefinition/8041.json
+++ b/data/json/CharacterSkinDefinition/8041.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      403,
+      369,
+      993
+    ]
   },
   "m_displayName": "WEAPON - IOP - Bouvaloir Orok M - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 25428,
   "m_i18nDescriptionId": 52444,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "0f97ac1acc264ebe817fbc93225fe7f5",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/8043.json b/data/json/CharacterSkinDefinition/8043.json
index 9f221a46f3525653a06ce255e29319c45b04298e..f0d84cb44424ed5e26ac602bdd599880fd85deae 100644
--- a/data/json/CharacterSkinDefinition/8043.json
+++ b/data/json/CharacterSkinDefinition/8043.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      909,
+      890,
+      330
+    ]
   },
   "m_displayName": "WEAPON - IOP - Glaive Stalaktoss F - Skin 01",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 7772,
   "m_i18nDescriptionId": 54461,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "068ac76ad98a433d967ccf31a65a76f2",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/8142.json b/data/json/CharacterSkinDefinition/8142.json
index 89290755d21f9e6b259877ed6f5f1f91cca1ffc4..922887aa71a6cb9efa221c47e6e6758e2d25424c 100644
--- a/data/json/CharacterSkinDefinition/8142.json
+++ b/data/json/CharacterSkinDefinition/8142.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "GARDIEN - COCHON - 1A",
-  "m_availability": 0,
+  "m_displayName": "GARDIEN - COCHON - BOUCHER - Jamon le Sanguinaire",
+  "m_availability": 2,
   "m_i18nNameId": 57607,
   "m_i18nDescriptionId": 83762,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/820.json b/data/json/CharacterSkinDefinition/820.json
index 56179578226f548e2e2a0898988c98dd0d9c4a12..689e7a610d88e3a47ef53edd8b62275511035d7b 100644
--- a/data/json/CharacterSkinDefinition/820.json
+++ b/data/json/CharacterSkinDefinition/820.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Chevalier Blanc",
+  "m_displayName": "MONSTRE - VAMPYRE - Chevalier Blanc",
   "m_availability": 0,
   "m_i18nNameId": 61183,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/8234.json b/data/json/CharacterSkinDefinition/8234.json
index c40ce3df10d8ea8665d6685d4899c0e8fb047485..50f4c324b09e2fa095a62d2cdb7424727d60e401 100644
--- a/data/json/CharacterSkinDefinition/8234.json
+++ b/data/json/CharacterSkinDefinition/8234.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Clone de Sang",
+  "m_displayName": "MONSTRE - VAMPYRE - ECORCHEUR",
   "m_availability": 0,
   "m_i18nNameId": 3432,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/8406.json b/data/json/CharacterSkinDefinition/8406.json
index a9b4780717b64b3590847b3edaddd545fb2246db..67a89ef11013e143e98480a14b718d9d92576aba 100644
--- a/data/json/CharacterSkinDefinition/8406.json
+++ b/data/json/CharacterSkinDefinition/8406.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - GRO BWORK - CLAN VOLCANO",
+  "m_availability": 3,
   "m_i18nNameId": 21433,
   "m_i18nDescriptionId": 22716,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/8413.json b/data/json/CharacterSkinDefinition/8413.json
index 786ab93be5b9f76a8f7a32f0453dbb3f944d8445..2fa999dae2b42963f3887864b54d331d2bc3a219 100644
--- a/data/json/CharacterSkinDefinition/8413.json
+++ b/data/json/CharacterSkinDefinition/8413.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Primodiaux F",
+  "m_displayName": "MONSTRE - VAMPYRE - Primordial F",
   "m_availability": 0,
   "m_i18nNameId": 60428,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/8414.json b/data/json/CharacterSkinDefinition/8414.json
index f2acfad05e1dd44b23b1076dffbf0eaeeafeef89..7cfe55a22c44f19505d1666518400ec8aee7acdb 100644
--- a/data/json/CharacterSkinDefinition/8414.json
+++ b/data/json/CharacterSkinDefinition/8414.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - SURIN - San Toku",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - SURIN - Crogneur",
+  "m_availability": 3,
   "m_i18nNameId": 59079,
   "m_i18nDescriptionId": 56135,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/8504.json b/data/json/CharacterSkinDefinition/8504.json
index 6a4769ecaa7900cd8f507c2f5c4eba1e2596847e..b06bef0c65c06778e4a396debf65da970dc8fbac 100644
--- a/data/json/CharacterSkinDefinition/8504.json
+++ b/data/json/CharacterSkinDefinition/8504.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - PIRA\u0027BWORK - BWORKOKAK PIRATE",
+  "m_availability": 3,
   "m_i18nNameId": 39458,
   "m_i18nDescriptionId": 42212,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/8538.json b/data/json/CharacterSkinDefinition/8538.json
index e0564d28d27951f0193170b07fa9872590faaae2..6d82fafbe5ac8681421ed14b9a7cde760b58d2a6 100644
--- a/data/json/CharacterSkinDefinition/8538.json
+++ b/data/json/CharacterSkinDefinition/8538.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé - Mineur M",
+  "m_displayName": "MONSTRE - VAMPYRE - Mineur M",
   "m_availability": 0,
   "m_i18nNameId": 84817,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/8576.json b/data/json/CharacterSkinDefinition/8576.json
index b13ca49e6faa10c00a7480aa4714162d20e65663..4f38ad7d5b30f7cca5dbe4e912cf888d37959dc7 100644
--- a/data/json/CharacterSkinDefinition/8576.json
+++ b/data/json/CharacterSkinDefinition/8576.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      417,
+      814,
+      558
+    ]
   },
   "m_displayName": "WEAPON - IOP - Justelame Brutale F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 74124,
   "m_i18nDescriptionId": 4599,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "d182369726064939a95242d72d9ae06d",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/8616.json b/data/json/CharacterSkinDefinition/8616.json
index 91feb3129df469f73f6f5f05d4bb7a27661031bb..c7c1bebebe50e6d76a806d78504a9bf7f5a18581 100644
--- a/data/json/CharacterSkinDefinition/8616.json
+++ b/data/json/CharacterSkinDefinition/8616.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - Jamon le Dragon-Cochon",
+  "m_displayName": "GARDIEN - COCHON - Jamon le Dragon-Cochon",
   "m_availability": 2,
   "m_i18nNameId": 90369,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/8718.json b/data/json/CharacterSkinDefinition/8718.json
index 55ec79b25b6d566e208cf77a46224adbded85959..70c6ae14e1a2d72e002f9db64726c66b65769e6c 100644
--- a/data/json/CharacterSkinDefinition/8718.json
+++ b/data/json/CharacterSkinDefinition/8718.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 8718,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      939,
+      754,
+      178
+    ]
   },
   "m_displayName": "WEAPON - CRA - Expingole M - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 95043,
   "m_i18nDescriptionId": 98329,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "30832bb019f4450f8f7d65766e10859b",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9001.json b/data/json/CharacterSkinDefinition/9001.json
index f93c904a05f28a083da9f27730228618fc55825a..7b0b9c7c05fd46c140727d0f41e727d9344f76c6 100644
--- a/data/json/CharacterSkinDefinition/9001.json
+++ b/data/json/CharacterSkinDefinition/9001.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - CRABE - KARAB",
+  "m_availability": 3,
   "m_i18nNameId": 97331,
   "m_i18nDescriptionId": 31975,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9014.json b/data/json/CharacterSkinDefinition/9014.json
index 3d45ad12574ae08d52ee6969c36d3b8bb122d34c..7f37f7cc172dcfc7416eaa6b491565eae889e203 100644
--- a/data/json/CharacterSkinDefinition/9014.json
+++ b/data/json/CharacterSkinDefinition/9014.json
@@ -9,7 +9,7 @@
     "gender": 2,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Soldate Bouclier",
+  "m_displayName": "PNJ - BONTA - Soldate Bouclier",
   "m_availability": 3,
   "m_i18nNameId": 21539,
   "m_i18nDescriptionId": 46226,
diff --git a/data/json/CharacterSkinDefinition/9137.json b/data/json/CharacterSkinDefinition/9137.json
index 76bba4649ae677c8ad30c6c1f2625066bd4d8a6d..a8f85748fe4fe01403172437f4d354a751ff4761 100644
--- a/data/json/CharacterSkinDefinition/9137.json
+++ b/data/json/CharacterSkinDefinition/9137.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 9137,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      747,
+      254,
+      905
+    ]
   },
   "m_displayName": "WEAPON - CRA - Expingole F - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 54756,
   "m_i18nDescriptionId": 98603,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "d52e7bc2d65746a6945e7752152ca190",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9142.json b/data/json/CharacterSkinDefinition/9142.json
index 1b1d4e51b744336af1c7c0d549781c33230e2f88..b890f3a887703377c5bea3787fd2f11ee48cdb48 100644
--- a/data/json/CharacterSkinDefinition/9142.json
+++ b/data/json/CharacterSkinDefinition/9142.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "GARDIEN - CHAFER - PIKAROSS - Liche Azundor",
-  "m_availability": 2,
+  "m_availability": 0,
   "m_i18nNameId": 68447,
   "m_i18nDescriptionId": 99210,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9198.json b/data/json/CharacterSkinDefinition/9198.json
index 2e4d105b689a2b8eaef3f49081e14e055db66c99..fd5c7c48fb9cdbde91cfc9d6f408985e7d5edf86 100644
--- a/data/json/CharacterSkinDefinition/9198.json
+++ b/data/json/CharacterSkinDefinition/9198.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Aligore",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - CHAFER - PIKAROSS - Kasimordo Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 76551,
   "m_i18nDescriptionId": 13192,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9392.json b/data/json/CharacterSkinDefinition/9392.json
index 92b93ed9c6b306705a0dadeee910bdd348a8aa24..e12b4064f503e1f2c7ed06295fe232224712efc4 100644
--- a/data/json/CharacterSkinDefinition/9392.json
+++ b/data/json/CharacterSkinDefinition/9392.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "WEAPON - ENIRIPSA - Gemme Déphasante M - Skin 02",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 56037,
   "m_i18nDescriptionId": 35556,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9395.json b/data/json/CharacterSkinDefinition/9395.json
index 4c1c95038eef4e78abacb6c7a87324c8a3e7aeba..c182cc70791786f216b98e85307b63613d1c30fc 100644
--- a/data/json/CharacterSkinDefinition/9395.json
+++ b/data/json/CharacterSkinDefinition/9395.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      665,
+      738,
+      18
+    ]
   },
   "m_displayName": "WEAPON - IOP - Justelame Brutale M - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 89544,
   "m_i18nDescriptionId": 22350,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "418794a8c6f14a85b26d11f5c09bc52e",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9448.json b/data/json/CharacterSkinDefinition/9448.json
index 7874f5d42de9e002e61af22f0de588a66be9caac..b4dbb44c479bf9a1360949cb3d3fec9cffe16f3c 100644
--- a/data/json/CharacterSkinDefinition/9448.json
+++ b/data/json/CharacterSkinDefinition/9448.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - SRAM - Cisaille Orishi F - Skin 01",
+  "m_availability": 2,
   "m_i18nNameId": 84610,
   "m_i18nDescriptionId": 75130,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9507.json b/data/json/CharacterSkinDefinition/9507.json
deleted file mode 100644
index 27417a279c854da041e162ea951e4445bc4912e4..0000000000000000000000000000000000000000
--- a/data/json/CharacterSkinDefinition/9507.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "9507",
-  "m_jsonRepresentation": {
-    "type": "CharacterSkinDefinition",
-    "id": 9507,
-    "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
-  },
-  "m_displayName": "MECHANISM - XELOR - Xelocube Solaire",
-  "m_availability": 0,
-  "m_i18nNameId": 5844,
-  "m_i18nDescriptionId": 19084,
-  "assetGuid": "",
-  "m_eventGuid": "",
-  "size": 0
-}
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9517.json b/data/json/CharacterSkinDefinition/9517.json
index 91241fc3ff4f746e5bc8669162f9eb00960ad8a4..700d87a8e33ef64b49e3a3019382e916d4bf11ef 100644
--- a/data/json/CharacterSkinDefinition/9517.json
+++ b/data/json/CharacterSkinDefinition/9517.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - CRABE - KRABAPIC",
+  "m_availability": 3,
   "m_i18nNameId": 56511,
   "m_i18nDescriptionId": 36515,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9538.json b/data/json/CharacterSkinDefinition/9538.json
index 49d28e7ff10823eec9f1adb3ff01888296bd6621..6f574b68e02d30b41e6aeec368241c3c8cfd7bdc 100644
--- a/data/json/CharacterSkinDefinition/9538.json
+++ b/data/json/CharacterSkinDefinition/9538.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 2,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      80,
+      423,
+      908
+    ]
   },
   "m_displayName": "WEAPON - IOP - Lamarguedon Spectral F - Skin 01",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 29275,
   "m_i18nDescriptionId": 64022,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "da39ee23c8a342338903fcca0e4858c1",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/958.json b/data/json/CharacterSkinDefinition/958.json
index 8d19182b2bae841eb26b76255ba0b4537aaae893..9cb9fe0c19f05e324de0f2f7d967bc294d1b7744 100644
--- a/data/json/CharacterSkinDefinition/958.json
+++ b/data/json/CharacterSkinDefinition/958.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 958,
     "rarity": 0,
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      619,
+      677,
+      610
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Aiguille Pikuxala M - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 25990,
   "m_i18nDescriptionId": 31207,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "a1dc2fe1171a4ce5a8b60a2392385b65",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9593.json b/data/json/CharacterSkinDefinition/9593.json
index 0242c2f9a7520f4f92a13fe8574820dd32e3f986..0ae76d5f371f576e19defd7484c9643a0d23870c 100644
--- a/data/json/CharacterSkinDefinition/9593.json
+++ b/data/json/CharacterSkinDefinition/9593.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - SRAM - Cisaille Orishi F - Skin 02",
+  "m_availability": 2,
   "m_i18nNameId": 96639,
   "m_i18nDescriptionId": 9544,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9678.json b/data/json/CharacterSkinDefinition/9678.json
index 6de6a23e20ab6a05e7056a63bbdf57d636b5ef02..21b706b706639ed91e744bac6a3e044b95494297 100644
--- a/data/json/CharacterSkinDefinition/9678.json
+++ b/data/json/CharacterSkinDefinition/9678.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - Réservé",
+  "m_displayName": "MONSTRE - VAMPYRE - Chauve-Souris Berseker M",
   "m_availability": 0,
   "m_i18nNameId": 38260,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/97.json b/data/json/CharacterSkinDefinition/97.json
index 10f3e97710f60e975dc61b81a3af36baf2618380..29bacde810d3d6a865279fbcf247735463601036 100644
--- a/data/json/CharacterSkinDefinition/97.json
+++ b/data/json/CharacterSkinDefinition/97.json
@@ -12,7 +12,7 @@
       590
     ]
   },
-  "m_displayName": "Creuzard",
+  "m_displayName": "PNJ - QUETE - CHAFER - Creuzard",
   "m_availability": 3,
   "m_i18nNameId": 49625,
   "m_i18nDescriptionId": 0,
diff --git a/data/json/CharacterSkinDefinition/9775.json b/data/json/CharacterSkinDefinition/9775.json
index 81c9f93fa6ced7964dcf1364e72e38a3c79f8d9f..f66900f3e20ec581f9d0ef8869ddee98ac92e086 100644
--- a/data/json/CharacterSkinDefinition/9775.json
+++ b/data/json/CharacterSkinDefinition/9775.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "MONSTRE - COCHON - BOUCHER - Grack Torrance",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE - COCHON - CLAN BOUCHER - Guerrier Boudeur Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 36824,
   "m_i18nDescriptionId": 23574,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9804.json b/data/json/CharacterSkinDefinition/9804.json
index 825d8a82785439902d19b44a8f0fda83a958f744..b13911dec698dc7f6216f24dac776f58818229e1 100644
--- a/data/json/CharacterSkinDefinition/9804.json
+++ b/data/json/CharacterSkinDefinition/9804.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Marins Bras de Fer",
+  "m_displayName": "PNJ - BONTA - Marins Bras de Fer",
   "m_availability": 3,
   "m_i18nNameId": 60322,
   "m_i18nDescriptionId": 85018,
diff --git a/data/json/CharacterSkinDefinition/9810.json b/data/json/CharacterSkinDefinition/9810.json
index 5a0e32d62605a7fdfdc915e6286136f5189c1df0..26f1c7406f32e3389f217252a897229cb89c2838 100644
--- a/data/json/CharacterSkinDefinition/9810.json
+++ b/data/json/CharacterSkinDefinition/9810.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      237,
+      101,
+      555
+    ]
   },
   "m_displayName": "WEAPON - IOP - Lamarguedon Spectral M - Skin 02",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 16853,
   "m_i18nDescriptionId": 46205,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "64180c6f5b344cfc968e07d622d6b9bf",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9815.json b/data/json/CharacterSkinDefinition/9815.json
index c52cc24e2dc89791b58d36f4b35f749b16acaca8..8fa1d5968a1bebe99689cede14d5426726d85ffa 100644
--- a/data/json/CharacterSkinDefinition/9815.json
+++ b/data/json/CharacterSkinDefinition/9815.json
@@ -10,7 +10,7 @@
     "defaultEmotes": []
   },
   "m_displayName": "MONSTRE - CHAFER - SURIN - Proctoss",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 24738,
   "m_i18nDescriptionId": 38006,
   "assetGuid": "",
diff --git a/data/json/CharacterSkinDefinition/9849.json b/data/json/CharacterSkinDefinition/9849.json
index a36783ec9624b746bc553a8f51228f1013c79940..55d2daecd551d2cf41ece4b1e4f7c53428121f99 100644
--- a/data/json/CharacterSkinDefinition/9849.json
+++ b/data/json/CharacterSkinDefinition/9849.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 9849,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      527,
+      164,
+      60
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Sabliaton Jikan F - Skin 01",
+  "m_availability": 3,
   "m_i18nNameId": 71636,
   "m_i18nDescriptionId": 3259,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "8706a8ed295d417184be6c17816e2b3a",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9900.json b/data/json/CharacterSkinDefinition/9900.json
index 79f362b4dd4709b53cbc3c2ff3cfb38e98c7b164..03d5da681b775549c56cef8f5047a7c5c2122e82 100644
--- a/data/json/CharacterSkinDefinition/9900.json
+++ b/data/json/CharacterSkinDefinition/9900.json
@@ -13,13 +13,17 @@
       }
     ],
     "gender": 1,
-    "defaultEmotes": []
+    "defaultEmotes": [
+      665,
+      738,
+      18
+    ]
   },
   "m_displayName": "WEAPON - IOP - Justelame Brutale M - Skin 02",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 90049,
   "m_i18nDescriptionId": 51575,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "418794a8c6f14a85b26d11f5c09bc52e",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9926.json b/data/json/CharacterSkinDefinition/9926.json
index 384a37463bbcff0afc77ab040801e22800fc7171..2a6906d4fa1a227cf25e5b18901bcf7b2e509caf 100644
--- a/data/json/CharacterSkinDefinition/9926.json
+++ b/data/json/CharacterSkinDefinition/9926.json
@@ -5,15 +5,25 @@
     "type": "CharacterSkinDefinition",
     "id": 9926,
     "rarity": 0,
-    "merchantCosts": [],
-    "gender": 1,
-    "defaultEmotes": []
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 15000
+      }
+    ],
+    "gender": 2,
+    "defaultEmotes": [
+      527,
+      164,
+      60
+    ]
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "WEAPON - XELOR - Sabliaton Jikan F - Skin 02",
+  "m_availability": 3,
   "m_i18nNameId": 87438,
   "m_i18nDescriptionId": 35245,
   "assetGuid": "",
-  "m_eventGuid": "",
+  "m_eventGuid": "8706a8ed295d417184be6c17816e2b3a",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/CharacterSkinDefinition/9983.json b/data/json/CharacterSkinDefinition/9983.json
index 45a3a4fba17bc518f964f9fc6f319aeef1149eb7..2a6117561e24ef3bca1773cdb0703d42b0b730c5 100644
--- a/data/json/CharacterSkinDefinition/9983.json
+++ b/data/json/CharacterSkinDefinition/9983.json
@@ -9,7 +9,7 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "NPC - BONTA - Marin Pecheur",
+  "m_displayName": "PNJ - BONTA - Marin Pecheur",
   "m_availability": 3,
   "m_i18nNameId": 80724,
   "m_i18nDescriptionId": 22071,
diff --git a/data/json/CharacterSkinDefinition/9999.json b/data/json/CharacterSkinDefinition/9999.json
index 5368e4afb0402c321670df3febf14d7b701c377f..b671f45f36aebec387646a19f68c162f0e67325c 100644
--- a/data/json/CharacterSkinDefinition/9999.json
+++ b/data/json/CharacterSkinDefinition/9999.json
@@ -9,8 +9,8 @@
     "gender": 1,
     "defaultEmotes": []
   },
-  "m_displayName": "New Character Skin",
-  "m_availability": 0,
+  "m_displayName": "MONSTRE - BWORK - PIRA\u0027BWORK - GRO BWORK PIRATE",
+  "m_availability": 3,
   "m_i18nNameId": 50251,
   "m_i18nDescriptionId": 57594,
   "assetGuid": "",
diff --git a/data/json/CompanionDefinition/117.json b/data/json/CompanionDefinition/117.json
index 14a49258505c3d2ecd6f4a760ceede5c450d2855..387ad9a2f69ce1c004c106f4b2d225e50f79815e 100644
--- a/data/json/CompanionDefinition/117.json
+++ b/data/json/CompanionDefinition/117.json
@@ -20,7 +20,7 @@
           "baseValue": 12.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 2
+            "reference": 6
           }
         }
       ],
@@ -38,7 +38,7 @@
       "baseValue": 157.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -46,28 +46,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 150
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 150
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -158,8 +167,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - COCHON - Niels Laren",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/124.json b/data/json/CompanionDefinition/124.json
index b5d5a872594019e6c036e34884023fd2034a2ba4..adbb3ae125cc4b9bd59268140f8898a7d007b49a 100644
--- a/data/json/CompanionDefinition/124.json
+++ b/data/json/CompanionDefinition/124.json
@@ -27,7 +27,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,25 +35,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -63,6 +87,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      6,
+      831,
+      509,
+      103,
+      292,
+      796,
+      409,
+      755,
+      118,
+      757
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,19 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      6,
-      831,
-      509,
-      103,
-      292,
-      796,
-      409,
-      755,
-      118,
-      757
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENIRIPSA - NECROME - Soigneuse Corrompue",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/125.json b/data/json/CompanionDefinition/125.json
index 04df895d803c81f28c8f7381f6df0919cfa1f014..63edf92e16ff19a1d1d1b98576f64cd1ff0a47d0 100644
--- a/data/json/CompanionDefinition/125.json
+++ b/data/json/CompanionDefinition/125.json
@@ -36,7 +36,7 @@
       "baseValue": 52.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -44,25 +44,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -72,6 +96,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -176,8 +201,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "XELOR - NECROME - Maitre Egreneur",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/126.json b/data/json/CompanionDefinition/126.json
index bb914348dd909fcda08f0107efe6674d16161fc6..19f6e1cc4348d249e088d874ff5f224ab6b9d915 100644
--- a/data/json/CompanionDefinition/126.json
+++ b/data/json/CompanionDefinition/126.json
@@ -41,16 +41,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -67,6 +57,24 @@
         6
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -76,6 +84,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -166,11 +175,10 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "XELOR - PALADIR - Oris",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 74167,
   "m_i18nDescriptionId": 16733,
   "assetGuid": "b7453da9f3598ea4cb57340305b42c99"
diff --git a/data/json/CompanionDefinition/135.json b/data/json/CompanionDefinition/135.json
index 31f6fe715f5b11dc3dcaf9b4e004e8b48af80780..b91d6279dfef43687e7e142565cf4063a6f37608 100644
--- a/data/json/CompanionDefinition/135.json
+++ b/data/json/CompanionDefinition/135.json
@@ -37,7 +37,7 @@
       "baseValue": 137.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 27.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +103,20 @@
         "amount": 7000
       }
     ],
+    "skills": [
+      877,
+      502,
+      938,
+      73,
+      737,
+      306,
+      146,
+      229,
+      379,
+      186,
+      890,
+      332
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -183,21 +221,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      877,
-      502,
-      938,
-      73,
-      737,
-      306,
-      146,
-      229,
-      379,
-      186,
-      890,
-      332
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Oropo",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/144.json b/data/json/CompanionDefinition/144.json
index 0ac0ab7503c16f72f58f5af99c00d18d84efa94f..a32fad5c913456d7b2254e429fe36d518bf5fc61 100644
--- a/data/json/CompanionDefinition/144.json
+++ b/data/json/CompanionDefinition/144.json
@@ -31,7 +31,7 @@
       "baseValue": 176.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 5
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 45.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,20 @@
         "amount": 9000
       }
     ],
+    "skills": [
+      893,
+      591,
+      457,
+      867,
+      771,
+      931,
+      7,
+      874,
+      907,
+      861,
+      301,
+      165
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,21 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      893,
-      591,
-      457,
-      867,
-      771,
-      931,
-      7,
-      874,
-      907,
-      861,
-      301,
-      165
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Goultard",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/146.json b/data/json/CompanionDefinition/146.json
index 326f25c0b072983323200c33676239f13e69689d..3f9522200d7bdc6be74a5d16d80ade3b66a1d544 100644
--- a/data/json/CompanionDefinition/146.json
+++ b/data/json/CompanionDefinition/146.json
@@ -26,7 +26,7 @@
       "baseValue": 73.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,8 +191,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SACRIEUR - Dofus 3.0 - Lagertha",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/158.json b/data/json/CompanionDefinition/158.json
index f6bc4f8be85dff91ae487adee70b767fe505c87a..a6fd149273739e419873884d01cebf29ca09f101 100644
--- a/data/json/CompanionDefinition/158.json
+++ b/data/json/CompanionDefinition/158.json
@@ -30,21 +30,45 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +78,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +169,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Kriss La Krass",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/1614.json b/data/json/CompanionDefinition/1614.json
index a51ff8c395b7dd58d7baa2889005c5c8c04423b6..7d9dab9924788aca7576cc34e108cd0f76c421fe 100644
--- a/data/json/CompanionDefinition/1614.json
+++ b/data/json/CompanionDefinition/1614.json
@@ -42,16 +42,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -68,6 +58,24 @@
         6
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -77,6 +85,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -167,8 +176,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "XELOR - NECROME - F",
   "m_availability": 0,
diff --git a/data/json/CompanionDefinition/162.json b/data/json/CompanionDefinition/162.json
index 3758f78807156f9271d80b0d334cbb01aa17bc5e..1a110ee94b854a6208795dec8877e36124e7240c 100644
--- a/data/json/CompanionDefinition/162.json
+++ b/data/json/CompanionDefinition/162.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Paco",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/171.json b/data/json/CompanionDefinition/171.json
index ef6472e4164710a0d640013bb398639a6bae8740..4d73c53a2ee9d08bfa7b3af404d5d2bf66e16293 100644
--- a/data/json/CompanionDefinition/171.json
+++ b/data/json/CompanionDefinition/171.json
@@ -28,7 +28,7 @@
       "baseValue": 66.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -64,6 +88,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -168,8 +193,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ENIRIPSA - Shura",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/173.json b/data/json/CompanionDefinition/173.json
index 8c5e5486ca4a3193fafe7a1241cd421762b9d594..c51f44bd79f4c1b7d21383aa0f2ae983af4dd51a 100644
--- a/data/json/CompanionDefinition/173.json
+++ b/data/json/CompanionDefinition/173.json
@@ -35,7 +35,7 @@
       "baseValue": 54.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -43,25 +43,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 7.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -71,6 +95,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -175,8 +200,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - Eclaireur d\u0027Elite",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/176.json b/data/json/CompanionDefinition/176.json
index 65e7ea5fa5037155ebbc0cf344b49375d8a60b4a..925d0caef947dac2763b55daa51eddb2f88bd27c 100644
--- a/data/json/CompanionDefinition/176.json
+++ b/data/json/CompanionDefinition/176.json
@@ -31,7 +31,7 @@
       "baseValue": 113.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,20 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      470,
+      406,
+      244,
+      369,
+      134,
+      826,
+      395,
+      27,
+      124,
+      487,
+      663,
+      117
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,21 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      470,
-      406,
-      244,
-      369,
-      134,
-      826,
-      395,
-      27,
-      124,
-      487,
-      663,
-      117
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Adamaï",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/178.json b/data/json/CompanionDefinition/178.json
index 5825c9ab2e3bde1b38d64dadcf4cff4bd54a6663..647a5966f77a113017065e008aa96bd3905feb36 100644
--- a/data/json/CompanionDefinition/178.json
+++ b/data/json/CompanionDefinition/178.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Nugget",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/188.json b/data/json/CompanionDefinition/188.json
index cd4ef2ec3e66684b62a0f8a130f74b92c8152136..cef1e51290d6881d43e66763db1ab6122205e506 100644
--- a/data/json/CompanionDefinition/188.json
+++ b/data/json/CompanionDefinition/188.json
@@ -32,7 +32,7 @@
       "baseValue": 54.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 2000
       }
     ],
+    "skills": [
+      875,
+      828,
+      531,
+      13900,
+      247,
+      259,
+      14093,
+      988,
+      839,
+      741,
+      182
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      875,
-      828,
-      531,
-      13900,
-      247,
-      259,
-      14093,
-      988,
-      839,
-      741,
-      182
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SACRIEUR - Saly",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/191.json b/data/json/CompanionDefinition/191.json
index 0a64d71b006569332d149c1b4ddb02339785da58..3ade1a377cdba4fa91352b9a3b98f3a72a1bf664 100644
--- a/data/json/CompanionDefinition/191.json
+++ b/data/json/CompanionDefinition/191.json
@@ -28,7 +28,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -64,6 +88,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      96,
+      582,
+      912,
+      71,
+      346,
+      282,
+      510,
+      206,
+      419,
+      324
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,19 +213,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      96,
-      582,
-      912,
-      71,
-      346,
-      282,
-      510,
-      206,
-      419,
-      324
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SACRIEUR - Klaus",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/192.json b/data/json/CompanionDefinition/192.json
index 98fa48d2018be851755d1d7711ff31f1a5f20d48..d1f594b2c56ab13cc60ab6246dfc0982e169f034 100644
--- a/data/json/CompanionDefinition/192.json
+++ b/data/json/CompanionDefinition/192.json
@@ -40,7 +40,7 @@
       "baseValue": 93.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -48,25 +48,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -82,6 +106,7 @@
         "amount": 5000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -186,8 +211,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Flopin",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/213.json b/data/json/CompanionDefinition/213.json
index 0d5acbfd387103f7df914e858561adf3ea90d29a..542853b6267a86df0904c9403c704c527e0812f5 100644
--- a/data/json/CompanionDefinition/213.json
+++ b/data/json/CompanionDefinition/213.json
@@ -34,7 +34,7 @@
       "baseValue": 48.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -42,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -70,6 +94,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -174,8 +199,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - Argolio",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/215.json b/data/json/CompanionDefinition/215.json
index 8a8b768eb259975c9164e256f7b08e167d94336e..dccabe6ee19c8fcd4918fa8ae85f3f835a04a9e7 100644
--- a/data/json/CompanionDefinition/215.json
+++ b/data/json/CompanionDefinition/215.json
@@ -26,7 +26,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Cody",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/221.json b/data/json/CompanionDefinition/221.json
index 46345791433cc923149ec23011f46216953a746d..2ddb634ea760be95c3ddadd2d376a6b485018e92 100644
--- a/data/json/CompanionDefinition/221.json
+++ b/data/json/CompanionDefinition/221.json
@@ -31,7 +31,7 @@
       "baseValue": 130.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 36.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,20 @@
         "amount": 7000
       }
     ],
+    "skills": [
+      262,
+      939,
+      489,
+      211,
+      678,
+      666,
+      374,
+      850,
+      417,
+      102,
+      1157,
+      732
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,21 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      262,
-      939,
-      489,
-      211,
-      678,
-      666,
-      374,
-      850,
-      417,
-      102,
-      1157,
-      732
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Yugo",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/227.json b/data/json/CompanionDefinition/227.json
index 51cbbdfb489da302b3a1a23e241cc43cc79ad981..07a58ba611da73a109a29d708b49a9416379cc8b 100644
--- a/data/json/CompanionDefinition/227.json
+++ b/data/json/CompanionDefinition/227.json
@@ -26,7 +26,7 @@
       "baseValue": 72.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -198,8 +223,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SACRIEUR - PALADIR - Héros Martyr",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/229.json b/data/json/CompanionDefinition/229.json
index 43e843ef50a500873044eb3059c9db81aee3bf1d..9dd9aea2bfa297025694a00b2cbe9ccf062af9a2 100644
--- a/data/json/CompanionDefinition/229.json
+++ b/data/json/CompanionDefinition/229.json
@@ -26,7 +26,7 @@
       "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      581,
+      545,
+      702,
+      1997,
+      210,
+      615,
+      450,
+      2210,
+      422,
+      358,
+      16135
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,20 +204,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      581,
-      545,
-      702,
-      1997,
-      210,
-      615,
-      450,
-      2210,
-      422,
-      358,
-      16135
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - Igror",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/231.json b/data/json/CompanionDefinition/231.json
index b46a66a7b893adb150128dec1f286ecb6405f5b5..78b002ed2f783cb889022c4e6a016c022afcc4bb 100644
--- a/data/json/CompanionDefinition/231.json
+++ b/data/json/CompanionDefinition/231.json
@@ -38,7 +38,7 @@
       "baseValue": 100.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -46,25 +46,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -80,6 +104,19 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      810,
+      267,
+      314,
+      577,
+      204,
+      16,
+      460,
+      921,
+      215,
+      19441,
+      719
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,20 +221,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      810,
-      267,
-      314,
-      577,
-      204,
-      16,
-      460,
-      921,
-      215,
-      19441,
-      719
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Toxine",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/244.json b/data/json/CompanionDefinition/244.json
index 2bfb45197f19e15704c5c5217138232ef9b6c6be..b8f09c95be78016f21f6b5d688f6363a7b149927 100644
--- a/data/json/CompanionDefinition/244.json
+++ b/data/json/CompanionDefinition/244.json
@@ -32,7 +32,7 @@
       "baseValue": 59.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      208,
+      13079,
+      726,
+      910,
+      13002,
+      351,
+      607,
+      556,
+      15705,
+      865,
+      160
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      208,
-      13079,
-      726,
-      910,
-      13002,
-      351,
-      607,
-      556,
-      15705,
-      865,
-      160
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "XELOR - PALADIR - Gousset",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/248.json b/data/json/CompanionDefinition/248.json
index 24b9cf360909dcc63ec28a890445920044450d2a..5044e56a1a3a596a3636eb404110d0e29ae388e3 100644
--- a/data/json/CompanionDefinition/248.json
+++ b/data/json/CompanionDefinition/248.json
@@ -32,7 +32,7 @@
       "baseValue": 100.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 21.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,7 @@
         "amount": 6000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -187,8 +212,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Cléophée",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/254.json b/data/json/CompanionDefinition/254.json
index 764ad380cdd349a30a7532dc5a97c932cba0dc6c..820d6a72e4497c8b8285ffdfb4f31064fdff014e 100644
--- a/data/json/CompanionDefinition/254.json
+++ b/data/json/CompanionDefinition/254.json
@@ -26,7 +26,7 @@
       "baseValue": 190.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,28 +34,37 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -148,8 +157,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHUCHOTEUR - Craqueleur",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/256.json b/data/json/CompanionDefinition/256.json
index 5ea82b5be7e6e4f926b4c6f11e23ad5ba1023ab5..8d32b216be4cb3b7b6a049613eefd5d9fcb811ba 100644
--- a/data/json/CompanionDefinition/256.json
+++ b/data/json/CompanionDefinition/256.json
@@ -26,7 +26,7 @@
       "baseValue": 82.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      435,
+      670,
+      249,
+      703,
+      705,
+      488,
+      547,
+      1964,
+      648,
+      467
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -198,19 +234,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      435,
-      670,
-      249,
-      703,
-      705,
-      488,
-      547,
-      1964,
-      648,
-      467
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CRA - Plume",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/261.json b/data/json/CompanionDefinition/261.json
index c330d4b12f422275db9aac6f8db82a3c83c1453e..78c24debd2b068f07cf0c7cdbee3669863f11f5c 100644
--- a/data/json/CompanionDefinition/261.json
+++ b/data/json/CompanionDefinition/261.json
@@ -35,7 +35,7 @@
       "baseValue": 114.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -43,25 +43,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -77,6 +101,7 @@
         "amount": 7000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -181,8 +206,7 @@
       }
     ],
     "autoResurrect": true,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Kérubim",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/276.json b/data/json/CompanionDefinition/276.json
index 04c4e6f9a220b3894ceb76e7725d442a23db0045..fa2de531c4e9e314a29e340f99088c062166ea4e 100644
--- a/data/json/CompanionDefinition/276.json
+++ b/data/json/CompanionDefinition/276.json
@@ -31,7 +31,7 @@
       "baseValue": 154.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 42.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,20 @@
         "amount": 8000
       }
     ],
+    "skills": [
+      587,
+      339,
+      913,
+      540,
+      533,
+      923,
+      669,
+      824,
+      731,
+      660,
+      590,
+      621
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,21 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      587,
-      339,
-      913,
-      540,
-      533,
-      923,
-      669,
-      824,
-      731,
-      660,
-      590,
-      621
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Phaeris",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/293.json b/data/json/CompanionDefinition/293.json
index 3f0f33d268d6e96298d6cfe9f8eb64d5bb629e75..91f0706ca4fb4d21161c8cadcb00e400383d245e 100644
--- a/data/json/CompanionDefinition/293.json
+++ b/data/json/CompanionDefinition/293.json
@@ -26,7 +26,7 @@
       "baseValue": 82.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -198,8 +223,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ECAFLIP - Shani",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/302.json b/data/json/CompanionDefinition/302.json
index b4cce8221b40c0253000fb648b716d34fc87fcf9..82a7b9887c089a5bb2c32dd513ee3721051da6b6 100644
--- a/data/json/CompanionDefinition/302.json
+++ b/data/json/CompanionDefinition/302.json
@@ -13,7 +13,13 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 100
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         {
@@ -31,7 +37,7 @@
       "baseValue": 105.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +103,7 @@
         "amount": 5000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,8 +208,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Elely",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/309.json b/data/json/CompanionDefinition/309.json
index fa4547fa5cfccb6b0147a319276b3ea616c77b2b..37f61d62281a9508378761f5b4145e743976091e 100644
--- a/data/json/CompanionDefinition/309.json
+++ b/data/json/CompanionDefinition/309.json
@@ -37,7 +37,7 @@
       "baseValue": 105.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 21.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +103,7 @@
         "amount": 6000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -183,8 +208,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Justice",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/316.json b/data/json/CompanionDefinition/316.json
index f15a019e45c8162cfb45f37172cc495af4a7599a..e48c0464b048b6e41e7c8e70593c2ccdab419244 100644
--- a/data/json/CompanionDefinition/316.json
+++ b/data/json/CompanionDefinition/316.json
@@ -26,7 +26,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Teri",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/32.json b/data/json/CompanionDefinition/32.json
index bfe655112590267b73509ffd07ffe857206dbe30..921aed6d9dcfe1fffeeaca46f6cee7edac089a0f 100644
--- a/data/json/CompanionDefinition/32.json
+++ b/data/json/CompanionDefinition/32.json
@@ -32,7 +32,7 @@
       "baseValue": 143.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,20 @@
         "amount": 8000
       }
     ],
+    "skills": [
+      568,
+      30,
+      151,
+      128,
+      538,
+      368,
+      517,
+      67,
+      525,
+      550,
+      594,
+      198
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -178,21 +216,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      568,
-      30,
-      151,
-      128,
-      538,
-      368,
-      517,
-      67,
-      525,
-      550,
-      594,
-      198
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Jahash",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/334.json b/data/json/CompanionDefinition/334.json
index 69c58a52b9749fdf1d4df5148a59e94a77dc0106..4019a332cffb66f94adffe6d78f6ca8ad4422f7e 100644
--- a/data/json/CompanionDefinition/334.json
+++ b/data/json/CompanionDefinition/334.json
@@ -32,7 +32,7 @@
       "baseValue": 93.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,7 @@
         "amount": 5000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -178,8 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Lilotte",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/339.json b/data/json/CompanionDefinition/339.json
index b0ab1449ca55943f154be557517f098111829144..aa460eb42dca6b0a015ae5fbe860dea60f7d5df7 100644
--- a/data/json/CompanionDefinition/339.json
+++ b/data/json/CompanionDefinition/339.json
@@ -31,7 +31,7 @@
       "baseValue": 94.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,20 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      110,
+      184,
+      490,
+      141,
+      797,
+      207,
+      998,
+      268,
+      869,
+      730,
+      788,
+      18272
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,21 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      110,
-      184,
-      490,
-      141,
-      797,
-      207,
-      998,
-      268,
-      869,
-      730,
-      788,
-      18272
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Bakara",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/34.json b/data/json/CompanionDefinition/34.json
index 59da388c757edc907aefba79400ff93e1b9d14ae..2c35a4d15f542e0b06b30399441c49ac3b911c7d 100644
--- a/data/json/CompanionDefinition/34.json
+++ b/data/json/CompanionDefinition/34.json
@@ -32,7 +32,7 @@
       "baseValue": 102.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 35.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,7 @@
         "amount": 7000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -179,8 +204,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Percimol",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/342.json b/data/json/CompanionDefinition/342.json
index 91cfbdeae33a2bb332963c46e28ac6ec28f6c982..1d6ca928da2edaf82f198410278d17d91193bf21 100644
--- a/data/json/CompanionDefinition/342.json
+++ b/data/json/CompanionDefinition/342.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Tika",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/350.json b/data/json/CompanionDefinition/350.json
index cfadda19f071515631291c0bd55f361acaf782bc..7f00ed80c4a4968a5eddbeecceb808278b407e9c 100644
--- a/data/json/CompanionDefinition/350.json
+++ b/data/json/CompanionDefinition/350.json
@@ -37,7 +37,7 @@
       "baseValue": 96.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +103,7 @@
         "amount": 5000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,8 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Dathura",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/359.json b/data/json/CompanionDefinition/359.json
index 7a347392d2751f8d99a90bd806a9cb16d2a9464b..515f1a28b2628d839da92f2a76dd35047b422121 100644
--- a/data/json/CompanionDefinition/359.json
+++ b/data/json/CompanionDefinition/359.json
@@ -29,7 +29,7 @@
       "baseValue": 63.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 7.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -65,6 +89,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      934,
+      543,
+      514,
+      8506,
+      363,
+      289,
+      679,
+      641,
+      17776,
+      17858
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -169,19 +205,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      934,
-      543,
-      514,
-      8506,
-      363,
-      289,
-      679,
-      641,
-      17776,
-      17858
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SACRIEUR - NECROME - Championne Sanglante",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/370.json b/data/json/CompanionDefinition/370.json
index cf94a738ee81c75db724ab9c690e798568a4fe43..9c6f537e94f418e9bbbaf3edee78640ecf6d47a0 100644
--- a/data/json/CompanionDefinition/370.json
+++ b/data/json/CompanionDefinition/370.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Dodge",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/376.json b/data/json/CompanionDefinition/376.json
index 0548b05d1c43e75592ba0ba71f0ea9d83b45b88d..b1c5b471bf2a80f46cec3a2d0e656a6093060f08 100644
--- a/data/json/CompanionDefinition/376.json
+++ b/data/json/CompanionDefinition/376.json
@@ -32,7 +32,7 @@
       "baseValue": 76.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,20 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      121,
+      619,
+      941,
+      241,
+      995,
+      474,
+      222,
+      355,
+      18814,
+      19024,
+      603,
+      688
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -178,21 +216,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      121,
-      619,
-      941,
-      241,
-      995,
-      474,
-      222,
-      355,
-      18814,
-      19024,
-      603,
-      688
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Comte Harebourg",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/378.json b/data/json/CompanionDefinition/378.json
index 3b063561c26eecf85c8bb18f0ea226efe1b24b88..fb49bb46529d718374ae4f240e6f1dccddd8315f 100644
--- a/data/json/CompanionDefinition/378.json
+++ b/data/json/CompanionDefinition/378.json
@@ -34,7 +34,7 @@
       "baseValue": 50.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -42,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -70,6 +94,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -174,8 +199,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - Flècheur",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/38.json b/data/json/CompanionDefinition/38.json
index f7f2b788c467e026d927bfc9185270216a694914..d08677165b257563355391f56cc92af5c2187cbd 100644
--- a/data/json/CompanionDefinition/38.json
+++ b/data/json/CompanionDefinition/38.json
@@ -26,7 +26,7 @@
       "baseValue": 83.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -198,8 +223,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ENIRIPSA - PALADIR - Persca",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/389.json b/data/json/CompanionDefinition/389.json
index 26a78d15e5289eeff2c214ca0037efbce9012989..4db63c9d798da7b58c318b96e6eb7a25bdda37ef 100644
--- a/data/json/CompanionDefinition/389.json
+++ b/data/json/CompanionDefinition/389.json
@@ -26,7 +26,7 @@
       "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      613,
+      291,
+      394,
+      41,
+      361,
+      745,
+      976,
+      254,
+      16161,
+      19645
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,19 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      613,
-      291,
-      394,
-      41,
-      361,
-      745,
-      976,
-      254,
-      16161,
-      19645
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "IOP - PALADIR - Gardienne Inflexible",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/395.json b/data/json/CompanionDefinition/395.json
index 82a231854c54c3b2603cf56086107f4fc5b7e445..b381d42e45ab1a4d4707688c2067f8a9ddb21de9 100644
--- a/data/json/CompanionDefinition/395.json
+++ b/data/json/CompanionDefinition/395.json
@@ -28,21 +28,45 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -68,6 +92,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -158,8 +183,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Maskemane",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/4.json b/data/json/CompanionDefinition/4.json
index bf5bbb0b300dea0a99f1f8feef41654822897bc9..62699f2d2b39a7927439e88439a6431371fdc813 100644
--- a/data/json/CompanionDefinition/4.json
+++ b/data/json/CompanionDefinition/4.json
@@ -26,7 +26,7 @@
       "baseValue": 75.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,8 +191,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "XELOR - Bleuette",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/401.json b/data/json/CompanionDefinition/401.json
index 10be36ed7ac409dd66249354375ddf9f598c7632..05608b8e5cb6f1038cb4c2e92856b9c0068c2cd0 100644
--- a/data/json/CompanionDefinition/401.json
+++ b/data/json/CompanionDefinition/401.json
@@ -37,7 +37,7 @@
       "baseValue": 135.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +103,20 @@
         "amount": 7000
       }
     ],
+    "skills": [
+      14,
+      189,
+      618,
+      203,
+      156,
+      739,
+      353,
+      478,
+      672,
+      320,
+      993,
+      945
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -183,21 +221,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      14,
-      189,
-      618,
-      203,
-      156,
-      739,
-      353,
-      478,
-      672,
-      320,
-      993,
-      945
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Julith",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/416.json b/data/json/CompanionDefinition/416.json
index 8c40a3f971616a6da869461516017554e56de6ae..bf8e05b54161ec03fae9a1cb42f7d6332e9c0e63 100644
--- a/data/json/CompanionDefinition/416.json
+++ b/data/json/CompanionDefinition/416.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Giny",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/417.json b/data/json/CompanionDefinition/417.json
index ea1b045cbb299125f552165f426d2ddc14339cc4..cd494f4787763d8c8ce6d8e4abf1415bfb7d7ed7 100644
--- a/data/json/CompanionDefinition/417.json
+++ b/data/json/CompanionDefinition/417.json
@@ -31,7 +31,7 @@
       "baseValue": 105.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 29.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,7 @@
         "amount": 6000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -186,8 +211,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Khan Karkass",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/419.json b/data/json/CompanionDefinition/419.json
index 21c589fcadafc4552125b9b684b37c7ee8b05657..a0e35673180784fc1511052516b83daf4376b26d 100644
--- a/data/json/CompanionDefinition/419.json
+++ b/data/json/CompanionDefinition/419.json
@@ -28,21 +28,45 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -52,6 +76,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -142,8 +167,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Grufon",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/42.json b/data/json/CompanionDefinition/42.json
index 1da53d22b8ce19d986d00633b1f89629590427eb..d3eee4d5472fdacfacb803ab448543379c3e272d 100644
--- a/data/json/CompanionDefinition/42.json
+++ b/data/json/CompanionDefinition/42.json
@@ -29,7 +29,7 @@
       "baseValue": 81.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -65,6 +89,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      11049,
+      943,
+      697,
+      779,
+      937,
+      11198,
+      984,
+      614,
+      429,
+      822
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -169,19 +205,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      11049,
-      943,
-      697,
-      779,
-      937,
-      11198,
-      984,
-      614,
-      429,
-      822
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - NECROME - Duelliste Spectral",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/427.json b/data/json/CompanionDefinition/427.json
index dd5dc37b088f25f07b1cc21c740a9d64155ddd6e..7667afc50d37723900d294b0c94e6607b6be5cb7 100644
--- a/data/json/CompanionDefinition/427.json
+++ b/data/json/CompanionDefinition/427.json
@@ -28,7 +28,7 @@
       "baseValue": 84.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -64,6 +88,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -168,8 +193,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SACRIEUR - SHUSHU - Dofus 3.0 - F",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/442.json b/data/json/CompanionDefinition/442.json
index 687003486c5796c3e07b2487927bcbf4a4b67c2e..4de759e4a4f43d6bd559cc2e392d5f7018d909fb 100644
--- a/data/json/CompanionDefinition/442.json
+++ b/data/json/CompanionDefinition/442.json
@@ -44,7 +44,7 @@
       "baseValue": 90.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -52,25 +52,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -86,6 +110,7 @@
         "amount": 5000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -191,8 +216,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Remington",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/445.json b/data/json/CompanionDefinition/445.json
index 74a0ecd8a74eb4409c7073c37adfade537d5b549..340454faeae4f996f98db0ebdb47a9d046a1c42f 100644
--- a/data/json/CompanionDefinition/445.json
+++ b/data/json/CompanionDefinition/445.json
@@ -29,7 +29,7 @@
       "baseValue": 75.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -65,6 +89,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -169,8 +194,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - Marcus",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/457.json b/data/json/CompanionDefinition/457.json
index 9fb5953b981205105214c98eec28b32400d6abe9..3d3bd54276e982fb4e792ee43edeb3cba8618428 100644
--- a/data/json/CompanionDefinition/457.json
+++ b/data/json/CompanionDefinition/457.json
@@ -20,7 +20,7 @@
           "baseValue": 2.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 2
+            "reference": 7
           }
         }
       ],
@@ -36,7 +36,7 @@
       "baseValue": 170.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -44,28 +44,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -157,8 +166,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHAFER - Baron Roméro",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/459.json b/data/json/CompanionDefinition/459.json
index d076030e7b427c97250616493039d393b8b594e7..cef1a240441aba7c41751d95faa6a877fa1775ea 100644
--- a/data/json/CompanionDefinition/459.json
+++ b/data/json/CompanionDefinition/459.json
@@ -28,24 +28,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 5
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -137,8 +146,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - TOFU - Scientifique",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/460.json b/data/json/CompanionDefinition/460.json
index d60dfaed25b3dc5113773db711105d244af2fe88..99f2e6d32aaa2a6e9e78ce3633d831723bc01cb9 100644
--- a/data/json/CompanionDefinition/460.json
+++ b/data/json/CompanionDefinition/460.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Vampyro",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/466.json b/data/json/CompanionDefinition/466.json
index 1784459e02c8a7de718d78500697d967f6acb52d..48e33b85729aa6cdc6e2412feafd67e5ad3e1df2 100644
--- a/data/json/CompanionDefinition/466.json
+++ b/data/json/CompanionDefinition/466.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -59,6 +67,7 @@
     },
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -163,8 +172,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "GARDIEN - Mouette Monstrueuse Feu",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/474.json b/data/json/CompanionDefinition/474.json
index 79c9468e7858e6ac22914f77accb0cf78610fd06..4182568e2f40e00576ee8457721dfc7a62ece4cd 100644
--- a/data/json/CompanionDefinition/474.json
+++ b/data/json/CompanionDefinition/474.json
@@ -42,16 +42,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -68,6 +58,24 @@
         8
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -77,6 +85,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -167,8 +176,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SACRIEUR - NECROME - Garlgaro",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/483.json b/data/json/CompanionDefinition/483.json
index 631cd74b69d2f9099e7d0641f69ef0291062e4d3..37c2ee5a47724e657c1fcf7a4697d9f72b3faf49 100644
--- a/data/json/CompanionDefinition/483.json
+++ b/data/json/CompanionDefinition/483.json
@@ -31,7 +31,7 @@
       "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 27.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,20 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      894,
+      32,
+      821,
+      133,
+      546,
+      644,
+      72,
+      983,
+      979,
+      526,
+      957,
+      217
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,21 +215,7 @@
       }
     ],
     "autoResurrect": true,
-    "equipableByPlayers": true,
-    "skills": [
-      894,
-      32,
-      821,
-      133,
-      546,
-      644,
-      72,
-      983,
-      979,
-      526,
-      957,
-      217
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Atcham",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/487.json b/data/json/CompanionDefinition/487.json
index 01c83e66c65ff15784fa9f15c196fd3fcc4b2dc6..917eeabe885577513ade5f57ce469412f2d06fec 100644
--- a/data/json/CompanionDefinition/487.json
+++ b/data/json/CompanionDefinition/487.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Rooster",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/492.json b/data/json/CompanionDefinition/492.json
index a08958db936831199bd8b5ccdbd2296df48c4d29..b0f0ed0a4407de25cae04555ce43c2eb394de31c 100644
--- a/data/json/CompanionDefinition/492.json
+++ b/data/json/CompanionDefinition/492.json
@@ -27,7 +27,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,25 +35,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -63,6 +87,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      31,
+      970,
+      900,
+      3690,
+      643,
+      668,
+      431,
+      270,
+      15256,
+      3709,
+      596
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,20 +204,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      31,
-      970,
-      900,
-      3690,
-      643,
-      668,
-      431,
-      270,
-      15256,
-      3709,
-      596
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENIRIPSA - NECROME - Ashmal",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/495.json b/data/json/CompanionDefinition/495.json
index 7f3d2e11c4c2580617e8be875f44a2046d9de183..12c5a21dd6551fd649974ee198c907803e0a92c0 100644
--- a/data/json/CompanionDefinition/495.json
+++ b/data/json/CompanionDefinition/495.json
@@ -31,21 +31,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 12
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 2,
     "actionRange": {
       "type": "ActionRange",
@@ -68,6 +76,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -158,8 +167,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ECAFLIP - NECROME - Cornisha",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/496.json b/data/json/CompanionDefinition/496.json
index 77fa4264300e02f567b73e84d7a49a5af266bcbe..f9b6e8ed8d0f5aad6eed0f4058ed6d685a408b64 100644
--- a/data/json/CompanionDefinition/496.json
+++ b/data/json/CompanionDefinition/496.json
@@ -30,24 +30,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -138,8 +147,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BONTA - Lion Kofman",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/503.json b/data/json/CompanionDefinition/503.json
index eebe938762eea8b1cb0b867d2e8a1f5d98a0f946..0a02ee5b81d78fc4e13be3d853b3e597a1b63668 100644
--- a/data/json/CompanionDefinition/503.json
+++ b/data/json/CompanionDefinition/503.json
@@ -30,21 +30,45 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +78,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +169,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Grany Smisse",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/506.json b/data/json/CompanionDefinition/506.json
index 4153fe9633902e145b67a7a4d35c7d10d4294945..912e482e080c6f5b8e4e167e4bf54f44126321f8 100644
--- a/data/json/CompanionDefinition/506.json
+++ b/data/json/CompanionDefinition/506.json
@@ -28,7 +28,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -36,28 +36,37 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -148,8 +157,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHAFER - Creuzar le Creuvar",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/507.json b/data/json/CompanionDefinition/507.json
index 03c7151ea1b3177a0437dbd6f1aba09c65daa8ae..f2041b79c3cd922780bd13ccc86d6b61c002b871 100644
--- a/data/json/CompanionDefinition/507.json
+++ b/data/json/CompanionDefinition/507.json
@@ -14,6 +14,11 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 100
+        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "sp",
@@ -37,7 +42,7 @@
       "baseValue": 108.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +50,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +108,20 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      962,
+      896,
+      571,
+      396,
+      761,
+      191,
+      956,
+      357,
+      471,
+      442,
+      468,
+      147
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,21 +227,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      962,
-      896,
-      571,
-      396,
-      761,
-      191,
-      956,
-      357,
-      471,
-      442,
-      468,
-      147
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Ush",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/52.json b/data/json/CompanionDefinition/52.json
index cc064562f9af4ec08f1ca71ecc2767ee8c8c11bc..21165233616ee5076e311824b5ed305973839864 100644
--- a/data/json/CompanionDefinition/52.json
+++ b/data/json/CompanionDefinition/52.json
@@ -32,7 +32,7 @@
       "baseValue": 79.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,18 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      253,
+      381,
+      727,
+      534,
+      846,
+      562,
+      819,
+      682,
+      480,
+      21
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -179,19 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      253,
-      381,
-      727,
-      534,
-      846,
-      562,
-      819,
-      682,
-      480,
-      21
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Joris",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/526.json b/data/json/CompanionDefinition/526.json
index 08ff7f82a86f06383eae9284aa15da9f3921060d..cf6eb43b1ff8fe9d33aaadeb27c91d65fffd8e01 100644
--- a/data/json/CompanionDefinition/526.json
+++ b/data/json/CompanionDefinition/526.json
@@ -41,16 +41,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -67,6 +57,24 @@
         10
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -76,6 +84,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -180,8 +189,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - SHUSHU - Dofus 3.0 - F",
   "m_availability": 0,
diff --git a/data/json/CompanionDefinition/532.json b/data/json/CompanionDefinition/532.json
index 2af0adab4c2d1ee303f7afc46d8f0f45e609208d..681bc21a9cafba4f045bf1ad71be9a208c4a29c7 100644
--- a/data/json/CompanionDefinition/532.json
+++ b/data/json/CompanionDefinition/532.json
@@ -34,7 +34,7 @@
       "baseValue": 75.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -42,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -70,6 +94,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -174,8 +199,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - PALADIR - Héros Impartial",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/538.json b/data/json/CompanionDefinition/538.json
index 0fd164fcee5056a4f50df13bc85aec6b94fd47b9..af61f1ee32c12e5a08babb1ff02649d6fc45b3ea 100644
--- a/data/json/CompanionDefinition/538.json
+++ b/data/json/CompanionDefinition/538.json
@@ -27,7 +27,7 @@
       "baseValue": 82.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,25 +35,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -63,6 +87,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      58,
+      304,
+      856,
+      857,
+      759,
+      640,
+      994,
+      917,
+      18246,
+      463
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -199,19 +235,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      58,
-      304,
-      856,
-      857,
-      759,
-      640,
-      994,
-      917,
-      18246,
-      463
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENUTROF - NECROME - Champion Croulant",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/544.json b/data/json/CompanionDefinition/544.json
index 9d65288a297fa16e88545c9df4a154c619ab80ce..88ff20604b443d88db9470da024d2977cca2286f 100644
--- a/data/json/CompanionDefinition/544.json
+++ b/data/json/CompanionDefinition/544.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Xav le Boulanger",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/551.json b/data/json/CompanionDefinition/551.json
index 8d90f0338cd89398c6dd360e378fe4004549e85e..e2d68225cb39bdaab754e8b76684d286470e59a8 100644
--- a/data/json/CompanionDefinition/551.json
+++ b/data/json/CompanionDefinition/551.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Moumoune",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/555.json b/data/json/CompanionDefinition/555.json
index 6df8c5881e2bcd32d3bcbff162f0141886b5063a..aba0690438a3783e380fce6f19e7e60a55d3bfaa 100644
--- a/data/json/CompanionDefinition/555.json
+++ b/data/json/CompanionDefinition/555.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      360,
+      629,
+      246,
+      185,
+      820,
+      65,
+      387,
+      977,
+      14926,
+      767,
+      521
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,20 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      360,
-      629,
-      246,
-      185,
-      820,
-      65,
-      387,
-      977,
-      14926,
-      767,
-      521
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENIRIPSA - Dargone",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/561.json b/data/json/CompanionDefinition/561.json
index ccf6b2321fc001cab9d3acc541449156724301a6..4b170a92023d11167262154869dfd6b513eea254 100644
--- a/data/json/CompanionDefinition/561.json
+++ b/data/json/CompanionDefinition/561.json
@@ -32,7 +32,7 @@
       "baseValue": 139.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 40.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,20 @@
         "amount": 7000
       }
     ],
+    "skills": [
+      418,
+      192,
+      583,
+      561,
+      57,
+      335,
+      662,
+      209,
+      701,
+      116,
+      18,
+      18752
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -179,21 +217,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      418,
-      192,
-      583,
-      561,
-      57,
-      335,
-      662,
-      209,
-      701,
-      116,
-      18,
-      18752
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Tristepin",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/568.json b/data/json/CompanionDefinition/568.json
index 97122c8dd9278dc07418ef09160a289e03642182..9967d6bfce63efccf1c3fcb885174dba047ad2f9 100644
--- a/data/json/CompanionDefinition/568.json
+++ b/data/json/CompanionDefinition/568.json
@@ -32,7 +32,7 @@
       "baseValue": 54.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 2000
       }
     ],
+    "skills": [
+      3018,
+      92,
+      78,
+      863,
+      476,
+      13431,
+      99,
+      686,
+      733,
+      919,
+      523
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      3018,
-      92,
-      78,
-      863,
-      476,
-      13431,
-      99,
-      686,
-      733,
-      919,
-      523
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - PALADIR - Héros Félin",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/572.json b/data/json/CompanionDefinition/572.json
index 825f994cdcd4da0229228610d286fa016bac2752..2e5c1a05410f71d8868422a22c1c4f9d67af01b0 100644
--- a/data/json/CompanionDefinition/572.json
+++ b/data/json/CompanionDefinition/572.json
@@ -42,16 +42,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -68,6 +58,40 @@
         8
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -77,6 +101,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -167,8 +192,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - NECROME - Championne Embrocheuse",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/578.json b/data/json/CompanionDefinition/578.json
index d1d7dc0e2c3d31ec241d49fe9948df47455e0067..947224d92129786ff492df68f7e633be29ab9dcc 100644
--- a/data/json/CompanionDefinition/578.json
+++ b/data/json/CompanionDefinition/578.json
@@ -42,16 +42,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -68,6 +58,24 @@
         1
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -77,6 +85,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -167,8 +176,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "FECA - NECROME - Championne Endoctrinée",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/585.json b/data/json/CompanionDefinition/585.json
index cca24e270824db52c8b5e77a9af2da0f65f63484..3d5f15b72dbbcee8a0c53990ef17760047b25f13 100644
--- a/data/json/CompanionDefinition/585.json
+++ b/data/json/CompanionDefinition/585.json
@@ -31,7 +31,7 @@
       "baseValue": 81.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,7 @@
         "amount": 5000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,8 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Lou",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/586.json b/data/json/CompanionDefinition/586.json
index 79332ae874a68642997efb4b7d9db6ba40688b3b..b64c20409be5ed5e2e88159f5828d551b2545933 100644
--- a/data/json/CompanionDefinition/586.json
+++ b/data/json/CompanionDefinition/586.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "atmin",
           "baseValue": -5.0,
           "factor": {
@@ -24,7 +24,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "atmax",
           "baseValue": 2.0,
           "factor": {
@@ -50,25 +50,34 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": 1.3
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -159,8 +168,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BOUFTOU - Dr. Francès Teigne",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/590.json b/data/json/CompanionDefinition/590.json
index 8e9b1f6d664ae858f50858310abc590f43764deb..08102f3e138c8dee4fb6df289a4f2a74af8b877b 100644
--- a/data/json/CompanionDefinition/590.json
+++ b/data/json/CompanionDefinition/590.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Qilby",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/592.json b/data/json/CompanionDefinition/592.json
index 84b1c5faf337dbd6cae6eadaac5a82f658cf8847..d29681bb5d80f102585e8cb6551b7126f8d54de3 100644
--- a/data/json/CompanionDefinition/592.json
+++ b/data/json/CompanionDefinition/592.json
@@ -18,7 +18,7 @@
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 2
+            "reference": 6
           }
         }
       ],
@@ -39,7 +39,7 @@
       "baseValue": 230.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -47,28 +47,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -159,8 +168,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHUCHOTEUR - Sir Hector V2",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/594.json b/data/json/CompanionDefinition/594.json
index 6d494ad371812e452c432b6cd3e71849b1688058..6e0ce79748ec2b410a2e9b34424982d5012851d8 100644
--- a/data/json/CompanionDefinition/594.json
+++ b/data/json/CompanionDefinition/594.json
@@ -26,7 +26,7 @@
       "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,8 +192,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ENUTROF - PALADIR - Chevaucheur Ancien",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/599.json b/data/json/CompanionDefinition/599.json
index 4422e35e4ca975d7f786a3c067351a04fedb621f..b7b460892e87dff0a8fa5153a137d0e13968e912 100644
--- a/data/json/CompanionDefinition/599.json
+++ b/data/json/CompanionDefinition/599.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "at",
           "baseValue": 4.0,
           "factor": {
@@ -34,7 +34,7 @@
       13
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 127.0,
       "factor": {
@@ -47,18 +47,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
@@ -66,9 +56,28 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -159,8 +168,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BOUFTOU - Ralph Lalen",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/600.json b/data/json/CompanionDefinition/600.json
index a1d1c0b81b9f2a5fc345ea7bdc382626fb9d1ffe..de6ad0aafa1279f61fec604b6c1c85597b14df0b 100644
--- a/data/json/CompanionDefinition/600.json
+++ b/data/json/CompanionDefinition/600.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Otomaï",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/601.json b/data/json/CompanionDefinition/601.json
index e12fd62635c0a3a982cda16cc56a65a371bc4595..12aa731bea82dade13a8102ddd8e6d405b8d9199 100644
--- a/data/json/CompanionDefinition/601.json
+++ b/data/json/CompanionDefinition/601.json
@@ -32,7 +32,7 @@
       "baseValue": 99.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,19 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      735,
+      992,
+      421,
+      707,
+      518,
+      872,
+      93,
+      744,
+      766,
+      922,
+      168
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -178,20 +215,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      735,
-      992,
-      421,
-      707,
-      518,
-      872,
-      93,
-      744,
-      766,
-      922,
-      168
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Dark Vlad",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/607.json b/data/json/CompanionDefinition/607.json
index 1e4ca0b6997667672e3664b4ff47ca2604d7bf62..1a8b04a742a2e9312fb4e4dea1eacc5780dcbbf0 100644
--- a/data/json/CompanionDefinition/607.json
+++ b/data/json/CompanionDefinition/607.json
@@ -27,7 +27,7 @@
       "baseValue": 175.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,28 +35,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -148,8 +157,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHUCHOTEUR - Fantassins Résistants",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/61.json b/data/json/CompanionDefinition/61.json
index 244208faaa756481b20fd97b545869ae893de6d5..d89a3135a611bd1347b797252b1f2c2ce656ba29 100644
--- a/data/json/CompanionDefinition/61.json
+++ b/data/json/CompanionDefinition/61.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      404,
+      226,
+      485,
+      792,
+      145,
+      505,
+      15027,
+      38,
+      125,
+      144,
+      916
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,20 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      404,
-      226,
-      485,
-      792,
-      145,
-      505,
-      15027,
-      38,
-      125,
-      144,
-      916
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENIRIPSA - PALADIR - Pacificatrice Enjouée",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/628.json b/data/json/CompanionDefinition/628.json
index 57e84582408c5e2874edc70362270c1a7966e6a9..57259187538cc7e5eed68942efe7ddc5fa51af25 100644
--- a/data/json/CompanionDefinition/628.json
+++ b/data/json/CompanionDefinition/628.json
@@ -26,7 +26,7 @@
       "baseValue": 72.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      297,
+      519,
+      74,
+      891,
+      158,
+      557,
+      10712,
+      10968,
+      960,
+      17869
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": true,
-    "equipableByPlayers": true,
-    "skills": [
-      297,
-      519,
-      74,
-      891,
-      158,
-      557,
-      10712,
-      10968,
-      960,
-      17869
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - Baron Sramedi",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/633.json b/data/json/CompanionDefinition/633.json
index bd74dd4c8d10949026a0f6110c2fe1d6339cefe3..7ef89c40555f955355259f80066c502760aac755 100644
--- a/data/json/CompanionDefinition/633.json
+++ b/data/json/CompanionDefinition/633.json
@@ -21,7 +21,9 @@
         }
       ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       8
@@ -32,7 +34,7 @@
       "baseValue": 63.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 16.0,
+      "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +94,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      458,
+      8535,
+      245,
+      536,
+      70,
+      15792,
+      142,
+      793,
+      372,
+      132,
+      789
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +211,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      458,
-      8535,
-      245,
-      536,
-      70,
-      15792,
-      142,
-      793,
-      372,
-      132,
-      789
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SACRIEUR - PALADIR - Oracle Offensé",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/635.json b/data/json/CompanionDefinition/635.json
index 1365ea2539a5e32cb1650d349b265298dd455e57..edc497e499fd85b200339ce7aa5e7fa24301ba61 100644
--- a/data/json/CompanionDefinition/635.json
+++ b/data/json/CompanionDefinition/635.json
@@ -18,7 +18,7 @@
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 2
+            "reference": 6
           }
         }
       ],
@@ -40,7 +40,7 @@
       "baseValue": 110.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -48,28 +48,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 4.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -160,8 +169,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHUCHOTEUR - Sir Hector V1",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/638.json b/data/json/CompanionDefinition/638.json
index e4b47e500c1acd839bec5449cd4738d3f93c735b..bc1e5cf6676cd9b2cab4707bb977eff788b1d6c3 100644
--- a/data/json/CompanionDefinition/638.json
+++ b/data/json/CompanionDefinition/638.json
@@ -28,24 +28,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -150,8 +159,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "GARDIEN - Mouette Monstrueuse Air",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/642.json b/data/json/CompanionDefinition/642.json
index 78d1336dfdd84f12a3d21d48d93183526d6bc751..73e10b5405fe71ab5f490c8e39323a070fa39ffe 100644
--- a/data/json/CompanionDefinition/642.json
+++ b/data/json/CompanionDefinition/642.json
@@ -32,7 +32,7 @@
       "baseValue": 79.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      45,
+      595,
+      275,
+      225,
+      818,
+      12,
+      405,
+      66,
+      16907,
+      17023,
+      588
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      45,
-      595,
-      275,
-      225,
-      818,
-      12,
-      405,
-      66,
-      16907,
-      17023,
-      588
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - Rémus",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/65.json b/data/json/CompanionDefinition/65.json
index 4baafb30be28fc0e9ecdfcb3e77d9233b99d6cf7..4212741978179c5b1ed72cf1d469c9b4bfe5dada 100644
--- a/data/json/CompanionDefinition/65.json
+++ b/data/json/CompanionDefinition/65.json
@@ -26,7 +26,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - César",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/656.json b/data/json/CompanionDefinition/656.json
index f2e38710e10409f9b16ac8ff47809fca217e2b38..1985306af50ccc8a22e92fb4aa30d7b8d5c199ec 100644
--- a/data/json/CompanionDefinition/656.json
+++ b/data/json/CompanionDefinition/656.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Armand",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/657.json b/data/json/CompanionDefinition/657.json
index 9c6076c0273aad15cd841c3171c03803b24b8ea4..e60ac255f1228ba2a0587d1911f49dc29dba9292 100644
--- a/data/json/CompanionDefinition/657.json
+++ b/data/json/CompanionDefinition/657.json
@@ -29,7 +29,7 @@
       "baseValue": 56.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -65,6 +89,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      758,
+      847,
+      415,
+      162,
+      295,
+      799,
+      15803,
+      390,
+      560,
+      655,
+      635
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -169,20 +206,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      758,
-      847,
-      415,
-      162,
-      295,
-      799,
-      15803,
-      390,
-      560,
-      655,
-      635
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - Kaotika",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/661.json b/data/json/CompanionDefinition/661.json
index ca7b36b38c16fb2384118bf8546c266efd113896..33726c8556fab1bc9b04c40c9bd5be80b4427148 100644
--- a/data/json/CompanionDefinition/661.json
+++ b/data/json/CompanionDefinition/661.json
@@ -37,7 +37,7 @@
       "baseValue": 147.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 38.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +103,20 @@
         "amount": 8000
       }
     ],
+    "skills": [
+      630,
+      367,
+      441,
+      549,
+      462,
+      15,
+      684,
+      864,
+      661,
+      130,
+      637,
+      718
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -183,21 +221,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      630,
-      367,
-      441,
-      549,
-      462,
-      15,
-      684,
-      864,
-      661,
-      130,
-      637,
-      718
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Grougaloragran",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/662.json b/data/json/CompanionDefinition/662.json
index fb8cbdf17c9264c6112d2104d1f324e5798c43ff..0f2e38c0678a559222a7104110af48f8e93ac6a6 100644
--- a/data/json/CompanionDefinition/662.json
+++ b/data/json/CompanionDefinition/662.json
@@ -29,7 +29,7 @@
       "baseValue": 77.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -65,6 +89,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -201,8 +226,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - NECROME - Brutus",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/663.json b/data/json/CompanionDefinition/663.json
index 82d5eb88de77829911766d0c6f58d1ae18a3bffa..2a33c44acc05594fdbda16ca8d0ebaeb4ad6604f 100644
--- a/data/json/CompanionDefinition/663.json
+++ b/data/json/CompanionDefinition/663.json
@@ -41,16 +41,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -67,6 +57,24 @@
         5
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -76,6 +84,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -166,8 +175,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": []
+    "equipableByPlayers": true
   },
   "m_displayName": "ENUTROF - PALADIR - Héroine Séculaire",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/664.json b/data/json/CompanionDefinition/664.json
index 1fb1234c28d92b57ff32a6d052107c5ea0d9cd3d..a5104c7ecce337cc75b7d5f30ec53134622bdb0d 100644
--- a/data/json/CompanionDefinition/664.json
+++ b/data/json/CompanionDefinition/664.json
@@ -31,7 +31,7 @@
       "baseValue": 94.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,19 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      76,
+      622,
+      598,
+      493,
+      628,
+      321,
+      139,
+      46,
+      196,
+      274,
+      19437
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,20 +214,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      76,
-      622,
-      598,
-      493,
-      628,
-      321,
-      139,
-      46,
-      196,
-      274,
-      19437
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Amalia",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/666.json b/data/json/CompanionDefinition/666.json
index ecfe265d419e672cfc705e411132a934019323ff..b2f8282f91be0a9f32394f35509322edd6dd2e5e 100644
--- a/data/json/CompanionDefinition/666.json
+++ b/data/json/CompanionDefinition/666.json
@@ -31,7 +31,7 @@
       "baseValue": 117.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,25 +39,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -73,6 +97,19 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      597,
+      807,
+      860,
+      920,
+      115,
+      213,
+      772,
+      18890,
+      19,
+      126,
+      842
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -177,20 +214,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      597,
-      807,
-      860,
-      920,
-      115,
-      213,
-      772,
-      18890,
-      19,
-      126,
-      842
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Écho",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/683.json b/data/json/CompanionDefinition/683.json
index 1ac3622f344990113f59b239f981ad7f41d067e3..b1631a96ccc387354b76a486140dfbafea3d9900 100644
--- a/data/json/CompanionDefinition/683.json
+++ b/data/json/CompanionDefinition/683.json
@@ -35,7 +35,7 @@
       "baseValue": 82.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -43,25 +43,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -71,6 +95,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -175,8 +200,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - NECROME - Empaleur Embusqué",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/689.json b/data/json/CompanionDefinition/689.json
index 2c0d0c3d358395ce1fa38cc8719469f8a0f43057..5e8ef8b26593fc323eb46dd534130a5208936c5d 100644
--- a/data/json/CompanionDefinition/689.json
+++ b/data/json/CompanionDefinition/689.json
@@ -26,7 +26,7 @@
       "baseValue": 110.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Betty",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/696.json b/data/json/CompanionDefinition/696.json
index 016dac968db87eeaedb26a59901fb24fc36e9bbc..27954a7cd052651f03349703e87182b80c2ef500 100644
--- a/data/json/CompanionDefinition/696.json
+++ b/data/json/CompanionDefinition/696.json
@@ -26,7 +26,7 @@
       "baseValue": 85.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,8 +191,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SADIDA - PALADIR - Héros Chataigner",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/698.json b/data/json/CompanionDefinition/698.json
index 70098068b81aeee43581f0e2f71db272cf3492c6..77e51fd1f48d23d180e520aa1b86a28cdb35959e 100644
--- a/data/json/CompanionDefinition/698.json
+++ b/data/json/CompanionDefinition/698.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "hp",
           "baseValue": 10.0,
           "factor": {
@@ -31,7 +31,7 @@
       9
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 120.0,
       "factor": {
@@ -44,19 +44,28 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -147,8 +156,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BOUFTOU - Dafnis Sanguin",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/699.json b/data/json/CompanionDefinition/699.json
index 35c2e87417806eb78ab420eea0ef40897a0ef901..c98d70793a3311e4297eadc9c64e897eaff0710c 100644
--- a/data/json/CompanionDefinition/699.json
+++ b/data/json/CompanionDefinition/699.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Arty",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/72.json b/data/json/CompanionDefinition/72.json
index 0229d4b94a3403908a03f4a81a95fcdbad14e037..9a99e00f41436aeed5d53c66b9aa7d697a794b97 100644
--- a/data/json/CompanionDefinition/72.json
+++ b/data/json/CompanionDefinition/72.json
@@ -38,7 +38,7 @@
       "baseValue": 102.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -46,25 +46,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -80,6 +104,19 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      408,
+      412,
+      612,
+      89,
+      778,
+      155,
+      383,
+      713,
+      119,
+      11,
+      164
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,20 +221,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      408,
-      412,
-      612,
-      89,
-      778,
-      155,
-      383,
-      713,
-      119,
-      11,
-      164
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Alibert",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/726.json b/data/json/CompanionDefinition/726.json
index 95aba8e567b5ea9da22c5e1cc00568f6bd2bfa22..2b9cc68d0fc07ab1d399b2d363703f9a6410cdcf 100644
--- a/data/json/CompanionDefinition/726.json
+++ b/data/json/CompanionDefinition/726.json
@@ -23,7 +23,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 1.0,
       "factor": {
@@ -36,18 +36,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
@@ -55,9 +45,28 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -148,8 +157,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BOUFTOU - Boufquette",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/745.json b/data/json/CompanionDefinition/745.json
index 2ee4fbdeb2c84a0a2e6b794a9780f278e9e8c61c..80ff4a664b772f5cceb06c00f0571d04cb6e1412 100644
--- a/data/json/CompanionDefinition/745.json
+++ b/data/json/CompanionDefinition/745.json
@@ -33,7 +33,7 @@
       "baseValue": 54.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -41,25 +41,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -69,6 +93,19 @@
         "amount": 2000
       }
     ],
+    "skills": [
+      472,
+      830,
+      329,
+      61,
+      783,
+      307,
+      565,
+      14346,
+      14800,
+      25,
+      986
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -173,20 +210,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      472,
-      830,
-      329,
-      61,
-      783,
-      307,
-      565,
-      14346,
-      14800,
-      25,
-      986
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SADIDA - NECROME - Achméa",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/750.json b/data/json/CompanionDefinition/750.json
index 53c36a3c5e2f38086a6e0fe53b49cada4edddc66..3ea406b6a8a055c307b0d9241939116da77f7965 100644
--- a/data/json/CompanionDefinition/750.json
+++ b/data/json/CompanionDefinition/750.json
@@ -32,7 +32,7 @@
       "baseValue": 63.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,8 +197,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - VÉGÉTAL - Dofus 3.0 - Végétalia",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/753.json b/data/json/CompanionDefinition/753.json
index 624a480306cc61327962283245763e549398736a..3014719d32f57b2dd002411dd7dce07439645e85 100644
--- a/data/json/CompanionDefinition/753.json
+++ b/data/json/CompanionDefinition/753.json
@@ -33,7 +33,7 @@
       "baseValue": 67.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -41,25 +41,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -69,6 +93,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      501,
+      4341,
+      915,
+      325,
+      224,
+      242,
+      398,
+      576,
+      991,
+      899
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -173,19 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      501,
-      4341,
-      915,
-      325,
-      224,
-      242,
-      398,
-      576,
-      991,
-      899
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENUTROF - NECROME - Championne Périmée",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/769.json b/data/json/CompanionDefinition/769.json
index ac5ff2ce6ff83f263668c052fb7a08d61d72c3af..23ad2ebe1443acb665b91209b58e25982c600cdb 100644
--- a/data/json/CompanionDefinition/769.json
+++ b/data/json/CompanionDefinition/769.json
@@ -26,7 +26,7 @@
       "baseValue": 79.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,20 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      166,
+      328,
+      10,
+      634,
+      105,
+      961,
+      205,
+      794,
+      18584,
+      849,
+      5,
+      918
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -175,21 +213,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      166,
-      328,
-      10,
-      634,
-      105,
-      961,
-      205,
-      794,
-      18584,
-      849,
-      5,
-      918
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SADIDA - Larch",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/772.json b/data/json/CompanionDefinition/772.json
index 1c6f578a5b1f301bd086d21cdb61d63cff8dac96..e456718be7e52c378e83a41581b5748b8b116625 100644
--- a/data/json/CompanionDefinition/772.json
+++ b/data/json/CompanionDefinition/772.json
@@ -40,7 +40,7 @@
       "baseValue": 104.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -48,28 +48,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -160,8 +169,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BWORK - Capitaine Raskass",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/778.json b/data/json/CompanionDefinition/778.json
index b8b1fb56080634fe053cb640f74ef2d5075d0c9c..84139ea25566e21239ea04208cdccf04d8d5acf9 100644
--- a/data/json/CompanionDefinition/778.json
+++ b/data/json/CompanionDefinition/778.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Delta",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/788.json b/data/json/CompanionDefinition/788.json
index 008975d0521cf533d0fe3248dca7d1686454d89c..fa8eee6636ed07ee62b6d308496dddf56f19d794 100644
--- a/data/json/CompanionDefinition/788.json
+++ b/data/json/CompanionDefinition/788.json
@@ -34,7 +34,7 @@
       "baseValue": 70.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -42,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -70,6 +94,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -174,8 +199,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - Farnix",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/792.json b/data/json/CompanionDefinition/792.json
index d41e55bbcfa666ae708b8b4f325f4cc3afd4cd28..869cbed820ac6abf5467fd8d8bf1947f8d3d2589 100644
--- a/data/json/CompanionDefinition/792.json
+++ b/data/json/CompanionDefinition/792.json
@@ -26,7 +26,7 @@
       "baseValue": 72.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      466,
+      91,
+      201,
+      710,
+      350,
+      384,
+      6652,
+      188,
+      17379,
+      516
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      466,
-      91,
-      201,
-      710,
-      350,
-      384,
-      6652,
-      188,
-      17379,
-      516
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FECA - PALADIR - Héros Endurci",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/80.json b/data/json/CompanionDefinition/80.json
index 2685828652a732fdeb28be206401d72c596c3545..c00666ce896d4c59ab5aa3a5669727484743fe29 100644
--- a/data/json/CompanionDefinition/80.json
+++ b/data/json/CompanionDefinition/80.json
@@ -49,16 +49,6 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -75,6 +65,24 @@
         10
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -84,6 +92,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -174,8 +183,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ECAFLIP - Dofus 3.0 - M",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/801.json b/data/json/CompanionDefinition/801.json
index 51edd80a712d58f826e1b24df42b2764f9e3b29c..d1202930d718349f692adf2759d6d3a78dc5d88f 100644
--- a/data/json/CompanionDefinition/801.json
+++ b/data/json/CompanionDefinition/801.json
@@ -33,7 +33,7 @@
       "baseValue": 97.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -41,25 +41,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -75,6 +99,19 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      586,
+      978,
+      135,
+      600,
+      223,
+      724,
+      683,
+      440,
+      284,
+      926,
+      402
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -179,20 +216,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      586,
-      978,
-      135,
-      600,
-      223,
-      724,
-      683,
-      440,
-      284,
-      926,
-      402
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Bump",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/802.json b/data/json/CompanionDefinition/802.json
index 9b49b637fb08ac6b10fc5a097ff039a6b3606b13..754b6998c58c6b86c2d942372b4bd2a703fef6c3 100644
--- a/data/json/CompanionDefinition/802.json
+++ b/data/json/CompanionDefinition/802.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Bernadette",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/804.json b/data/json/CompanionDefinition/804.json
index cdab94f71651359b89855a0145222fad643ba100..63f2e4c3c3735eeb0b095c333b236ce6bc36f5ce 100644
--- a/data/json/CompanionDefinition/804.json
+++ b/data/json/CompanionDefinition/804.json
@@ -30,7 +30,7 @@
       "baseValue": 210.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -38,28 +38,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -151,8 +160,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - COCHON - Danny Zepig",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/807.json b/data/json/CompanionDefinition/807.json
index a6c2a90dcb83ed66731d238eeca6ebcd667c4668..bf73e2cb68f718c68d979e096dfcfb928e5ad46a 100644
--- a/data/json/CompanionDefinition/807.json
+++ b/data/json/CompanionDefinition/807.json
@@ -26,7 +26,7 @@
       "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      9288,
+      9516,
+      451,
+      10377,
+      10655,
+      445,
+      748,
+      260,
+      436,
+      15780,
+      356
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,20 +204,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      9288,
-      9516,
-      451,
-      10377,
-      10655,
-      445,
-      748,
-      260,
-      436,
-      15780,
-      356
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - Assa",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/815.json b/data/json/CompanionDefinition/815.json
index 6015c9831d31a942b560906434f45e44f106187f..165130d1d1fce2f11144fa8198b74f8a35aa4f4d 100644
--- a/data/json/CompanionDefinition/815.json
+++ b/data/json/CompanionDefinition/815.json
@@ -26,7 +26,7 @@
       "baseValue": 67.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      7605,
+      7783,
+      647,
+      855,
+      646,
+      781,
+      24,
+      914,
+      492,
+      327
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      7605,
-      7783,
-      647,
-      855,
-      646,
-      781,
-      24,
-      914,
-      492,
-      327
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "IOP - Zorine",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/817.json b/data/json/CompanionDefinition/817.json
index 2df009847dba5cb9cf16f77b98ad064ba712699b..01b09283be709ba8c9966eec2753eebc05e2e12e 100644
--- a/data/json/CompanionDefinition/817.json
+++ b/data/json/CompanionDefinition/817.json
@@ -28,24 +28,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 14
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -150,8 +159,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "GARDIEN - Mouette Monstrueuse Terre",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/819.json b/data/json/CompanionDefinition/819.json
index 68dc03c241723bf1058136c9d56fb2c8309a2898..ece1c15d3810de964c627366e7bf935586892718 100644
--- a/data/json/CompanionDefinition/819.json
+++ b/data/json/CompanionDefinition/819.json
@@ -26,7 +26,7 @@
       "baseValue": 66.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      64,
+      711,
+      9,
+      12973,
+      747,
+      277,
+      84,
+      77,
+      575,
+      866,
+      68
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,20 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      64,
-      711,
-      9,
-      12973,
-      747,
-      277,
-      84,
-      77,
-      575,
-      866,
-      68
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - Skhul",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/821.json b/data/json/CompanionDefinition/821.json
index 3998ae670e9bba134510fbcc431ecf76ebc94f31..349de7c8bf59112e372ebcd1b7828c73b9da8117 100644
--- a/data/json/CompanionDefinition/821.json
+++ b/data/json/CompanionDefinition/821.json
@@ -30,24 +30,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -139,8 +148,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BWORK - Craqueleur Magmatique",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/824.json b/data/json/CompanionDefinition/824.json
index 7b5e8decd5a7ce084b5ba4dc2a8fcc11e574bb9b..51372b5c77fcddd56ce87e5a179ce12f976ebae8 100644
--- a/data/json/CompanionDefinition/824.json
+++ b/data/json/CompanionDefinition/824.json
@@ -29,7 +29,7 @@
       "baseValue": 53.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -65,6 +89,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      123,
+      11972,
+      11576,
+      13,
+      264,
+      626,
+      551,
+      286,
+      676,
+      611
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -169,19 +205,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      123,
-      11972,
-      11576,
-      13,
-      264,
-      626,
-      551,
-      286,
-      676,
-      611
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - NECROME - Initiée Funèbre",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/827.json b/data/json/CompanionDefinition/827.json
index 1e2ee12fea3d211cf5fc889067f9b0c87bced566..d4d6ec1914293628d741570187a4c4cf6abb42eb 100644
--- a/data/json/CompanionDefinition/827.json
+++ b/data/json/CompanionDefinition/827.json
@@ -28,24 +28,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 2,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -150,8 +159,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "GARDIEN - Mouette Monstrueuse Eau",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/83.json b/data/json/CompanionDefinition/83.json
index 4cccacd939121ceda6d35be41dbb0eac2b25078b..461387f18f17cd0f158a1d66951a154226699b65 100644
--- a/data/json/CompanionDefinition/83.json
+++ b/data/json/CompanionDefinition/83.json
@@ -38,7 +38,7 @@
       "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -46,25 +46,49 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 27.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -80,6 +104,20 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      150,
+      477,
+      43,
+      972,
+      137,
+      573,
+      524,
+      333,
+      437,
+      765,
+      157,
+      200
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,21 +222,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      150,
-      477,
-      43,
-      972,
-      137,
-      573,
-      524,
-      333,
-      437,
-      765,
-      157,
-      200
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Corbeau Noir",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/830.json b/data/json/CompanionDefinition/830.json
index d9f89f62e0a6b0ac3f4c93f5005b3335bce44d17..3b8dd188619c301ea0e9821fc0cd47465c7c0cde 100644
--- a/data/json/CompanionDefinition/830.json
+++ b/data/json/CompanionDefinition/830.json
@@ -27,7 +27,7 @@
       "baseValue": 71.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,25 +35,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -63,6 +87,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -199,8 +224,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "FECA - NECROME - Bourreau Anonyme",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/832.json b/data/json/CompanionDefinition/832.json
index c68f97ebb4eadef6c9a1cef319db3e94c9f4fc69..704769bb1299eae54cf48ef7e88ac02339246dca 100644
--- a/data/json/CompanionDefinition/832.json
+++ b/data/json/CompanionDefinition/832.json
@@ -26,7 +26,7 @@
       "baseValue": 110.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Priss",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/835.json b/data/json/CompanionDefinition/835.json
index 2da5696bcd1cdba9a2c135042691cc0031a9cd80..9dbc18e2e6f15445fc372891cc83a53796a8290b 100644
--- a/data/json/CompanionDefinition/835.json
+++ b/data/json/CompanionDefinition/835.json
@@ -32,7 +32,7 @@
       "baseValue": 84.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      251,
+      432,
+      801,
+      300,
+      762,
+      555,
+      654,
+      3635,
+      16354,
+      814,
+      16722
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      251,
-      432,
-      801,
-      300,
-      762,
-      555,
-      654,
-      3635,
-      16354,
-      814,
-      16722
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - Séraphin",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/841.json b/data/json/CompanionDefinition/841.json
index f200ab6f70cdf84663a0aa7d4e31a03d899234d6..02e8a0d090ba20e0e3d457d0f49c7bf17b62f3fc 100644
--- a/data/json/CompanionDefinition/841.json
+++ b/data/json/CompanionDefinition/841.json
@@ -26,7 +26,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Barry",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/844.json b/data/json/CompanionDefinition/844.json
index df429c15739422a692f6b7190fef02c074889fa3..895e8e466e89c8d1ccef045bb3c6a993a3c2f8bd 100644
--- a/data/json/CompanionDefinition/844.json
+++ b/data/json/CompanionDefinition/844.json
@@ -38,7 +38,7 @@
       "baseValue": 109.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -46,25 +46,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -80,6 +104,7 @@
         "amount": 6000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,8 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Évangelyne",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/845.json b/data/json/CompanionDefinition/845.json
index 1966707017aaf934945b24b0d35bdd1a60128e50..68801caff12a6d83580639fb9a864337ffec3c24 100644
--- a/data/json/CompanionDefinition/845.json
+++ b/data/json/CompanionDefinition/845.json
@@ -32,7 +32,7 @@
       "baseValue": 54.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 2000
       }
     ],
+    "skills": [
+      154,
+      447,
+      359,
+      736,
+      227,
+      552,
+      433,
+      37,
+      13440,
+      734,
+      656
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,20 +209,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      154,
-      447,
-      359,
-      736,
-      227,
-      552,
-      433,
-      37,
-      13440,
-      734,
-      656
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - PALADIR - Sentinelle Affutée",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/846.json b/data/json/CompanionDefinition/846.json
index e580905977814488719ce7e43d999e4758070309..b3d8a1bb755e462c573c3c214e13122fb9e3d09b 100644
--- a/data/json/CompanionDefinition/846.json
+++ b/data/json/CompanionDefinition/846.json
@@ -26,7 +26,7 @@
       "baseValue": 84.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      12140,
+      859,
+      506,
+      777,
+      512,
+      768,
+      12565,
+      12739,
+      315,
+      311,
+      760
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,20 +203,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      12140,
-      859,
-      506,
-      777,
-      512,
-      768,
-      12565,
-      12739,
-      315,
-      311,
-      760
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SRAM - PALADIR - Exécuteur Endeuillé",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/847.json b/data/json/CompanionDefinition/847.json
index 369eef23176b9f080763a58560499bee28eec36b..ea4ecdde84f163ce5ba3f9a89c1a4484867fccbc 100644
--- a/data/json/CompanionDefinition/847.json
+++ b/data/json/CompanionDefinition/847.json
@@ -37,7 +37,7 @@
       "baseValue": 141.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -79,6 +103,20 @@
         "amount": 7000
       }
     ],
+    "skills": [
+      484,
+      868,
+      218,
+      932,
+      829,
+      1020,
+      20,
+      326,
+      389,
+      305,
+      769,
+      352
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -183,21 +221,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      484,
-      868,
-      218,
-      932,
-      829,
-      1020,
-      20,
-      326,
-      389,
-      305,
-      769,
-      352
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Nox",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/857.json b/data/json/CompanionDefinition/857.json
index b9b43de22ec786dbd5cd4abca167f5d3a3915478..666b4bcb87cc5f0554f905783e50abb3d0c8d499 100644
--- a/data/json/CompanionDefinition/857.json
+++ b/data/json/CompanionDefinition/857.json
@@ -30,7 +30,7 @@
       "baseValue": 70.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -38,19 +38,28 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -141,8 +150,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BWORK - Vorti le Rebelle - Allié",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/858.json b/data/json/CompanionDefinition/858.json
index 72334fe2592ba50163fb630f10fde6bcbb6446f4..4f65d2c7283d2da837fca03e57358a92002db217 100644
--- a/data/json/CompanionDefinition/858.json
+++ b/data/json/CompanionDefinition/858.json
@@ -26,7 +26,7 @@
       "baseValue": 110.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Columba",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/86.json b/data/json/CompanionDefinition/86.json
index ce5e4d67ba931117feebfc2868d363420193968a..ae9271354f191cfa0a20887229f383121fa57bb6 100644
--- a/data/json/CompanionDefinition/86.json
+++ b/data/json/CompanionDefinition/86.json
@@ -26,7 +26,7 @@
       "baseValue": 63.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,8 +191,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "ENUTROF - Golgor",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/861.json b/data/json/CompanionDefinition/861.json
index db45727b39dcb90f5a7fdb03b411801bc6e772de..0fb779508c13796aabfe79b6ba202cf12e746d56 100644
--- a/data/json/CompanionDefinition/861.json
+++ b/data/json/CompanionDefinition/861.json
@@ -32,7 +32,7 @@
       "baseValue": 83.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -172,8 +197,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - Bourrin",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/88.json b/data/json/CompanionDefinition/88.json
index f25d4ddda1f70a0a8c620da747928b5d7c9761f7..7c19839849b9db801d11b8ff898a5a4f97841bc6 100644
--- a/data/json/CompanionDefinition/88.json
+++ b/data/json/CompanionDefinition/88.json
@@ -39,19 +39,28 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -142,8 +151,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - TOFU - Boulangère",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/884.json b/data/json/CompanionDefinition/884.json
index 149a2aad4aa305adba1ecbcc4efe7578654b88e1..9eb72aabf738839bdb77af25a46c7feafb9c647f 100644
--- a/data/json/CompanionDefinition/884.json
+++ b/data/json/CompanionDefinition/884.json
@@ -28,7 +28,7 @@
       "baseValue": 75.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -64,6 +88,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -169,8 +194,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SRAM - PALADIR - Héroïne Perfide",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/89.json b/data/json/CompanionDefinition/89.json
index 676a314bacd9fb37a122e4d97661da340e8fe94d..2405f571b1569acdcfa6d01ed84a9f1906ea077d 100644
--- a/data/json/CompanionDefinition/89.json
+++ b/data/json/CompanionDefinition/89.json
@@ -21,7 +21,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       9
@@ -32,7 +34,7 @@
       "baseValue": 87.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 17.0,
+      "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +94,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -181,8 +208,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "FECA - PALADIR - Alchimiste Armurée",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/897.json b/data/json/CompanionDefinition/897.json
index 7d8ed426fde05ee4f36eed2d86c846c12fe81263..91a01ec88e6103a04463714b05c8cb2302b3d4f1 100644
--- a/data/json/CompanionDefinition/897.json
+++ b/data/json/CompanionDefinition/897.json
@@ -27,7 +27,7 @@
       "baseValue": 63.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,25 +35,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -63,6 +87,19 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      563,
+      674,
+      584,
+      589,
+      966,
+      6819,
+      15584,
+      448,
+      795,
+      499,
+      7204
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -167,20 +204,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      563,
-      674,
-      584,
-      589,
-      966,
-      6819,
-      15584,
-      448,
-      795,
-      499,
-      7204
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "IOP - NECROME - Championne du Blasphème",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/90.json b/data/json/CompanionDefinition/90.json
index d31e9f18ce22b6e4eb38683bd1384d5a29c4f681..011def40c2704ef57fc09d0524bf6c3547bce93b 100644
--- a/data/json/CompanionDefinition/90.json
+++ b/data/json/CompanionDefinition/90.json
@@ -26,7 +26,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Yaki",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/900.json b/data/json/CompanionDefinition/900.json
index 6cbb9436ea27aa8f817749395008aff91236e202..baf1f2b53dbaf3ee80cae9a4fbc53e0476daa33d 100644
--- a/data/json/CompanionDefinition/900.json
+++ b/data/json/CompanionDefinition/900.json
@@ -31,25 +31,34 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": 0.0
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -140,8 +149,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - TOFU - Scar l\u0027Épouvanteur",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/905.json b/data/json/CompanionDefinition/905.json
index 68ac3c4b5d5d2eddbad64a1ff808ae75970cfdb3..46931a243250713716518c6bfc5b6900614c7359 100644
--- a/data/json/CompanionDefinition/905.json
+++ b/data/json/CompanionDefinition/905.json
@@ -41,16 +41,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -67,6 +57,24 @@
         5
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -76,6 +84,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -166,8 +175,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SADIDA - PALADIR - Âme de Sève",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/933.json b/data/json/CompanionDefinition/933.json
index 037e70718653f7d75b1e85487bef63300af07489..c90cdd67436dbcb6ccd04d67884980124839860c 100644
--- a/data/json/CompanionDefinition/933.json
+++ b/data/json/CompanionDefinition/933.json
@@ -27,7 +27,7 @@
       "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -35,25 +35,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -63,6 +87,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      400,
+      770,
+      299,
+      90,
+      609,
+      173,
+      837,
+      44,
+      380,
+      322,
+      530
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -168,20 +205,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      400,
-      770,
-      299,
-      90,
-      609,
-      173,
-      837,
-      44,
-      380,
-      322,
-      530
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - NECROME - Griffeur Tonkino",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/935.json b/data/json/CompanionDefinition/935.json
index fcb0d73bb1e53c9bfc57856b2174c28ec2bc3be9..7e37a4b782cae0490146128e2ec6a7d429652bfc 100644
--- a/data/json/CompanionDefinition/935.json
+++ b/data/json/CompanionDefinition/935.json
@@ -42,16 +42,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -68,6 +58,24 @@
         5
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -77,6 +85,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -167,8 +176,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "SADIDA - NECROME - Rôdeur Sylvestre",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/94.json b/data/json/CompanionDefinition/94.json
index c75349c9501eb1523751370fbbeafa217ea2c18d..bb16bb9e8b5daa0c31da573dce174a50a73bc9de 100644
--- a/data/json/CompanionDefinition/94.json
+++ b/data/json/CompanionDefinition/94.json
@@ -32,7 +32,7 @@
       "baseValue": 100.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -74,6 +98,20 @@
         "amount": 5000
       }
     ],
+    "skills": [
+      475,
+      403,
+      216,
+      240,
+      423,
+      885,
+      503,
+      444,
+      63,
+      738,
+      746,
+      527
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -178,21 +216,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      475,
-      403,
-      216,
-      240,
-      423,
-      885,
-      503,
-      444,
-      63,
-      738,
-      746,
-      527
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Coqueline",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/944.json b/data/json/CompanionDefinition/944.json
index b75f5b237107add0a8095c92f2c5215c700307aa..4cee0b3cd21bf3c22bae51746a18bd7a6acb38bd 100644
--- a/data/json/CompanionDefinition/944.json
+++ b/data/json/CompanionDefinition/944.json
@@ -31,7 +31,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -39,28 +39,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -151,8 +160,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - COCHON - Cochonnette",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/946.json b/data/json/CompanionDefinition/946.json
index 26a6b44ea9dc0ead5581c46be4af00bac6720d93..b52f0909dcaced507e9465c530436e102adc6015 100644
--- a/data/json/CompanionDefinition/946.json
+++ b/data/json/CompanionDefinition/946.json
@@ -32,7 +32,7 @@
       "baseValue": 78.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      773,
+      8,
+      113,
+      75,
+      712,
+      131,
+      310,
+      878,
+      17872,
+      179,
+      122
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -204,20 +241,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      773,
-      8,
-      113,
-      75,
-      712,
-      131,
-      310,
-      878,
-      17872,
-      179,
-      122
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ECAFLIP - SHUSHU - Shushire",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/948.json b/data/json/CompanionDefinition/948.json
index 3b9e587e8b33f7bebb0cbb0ae3f504e54291627d..4e53ce96dd207282cf63f794aa8bf73781cf899e 100644
--- a/data/json/CompanionDefinition/948.json
+++ b/data/json/CompanionDefinition/948.json
@@ -34,7 +34,7 @@
       "baseValue": 70.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -42,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 7.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -70,6 +94,7 @@
         "amount": 4000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -174,8 +199,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - Shuther",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/950.json b/data/json/CompanionDefinition/950.json
index fc1be8848102f807220aa15025cb4835ebff98ea..c9de271761a1e57087268096c0c0b740f3e7792c 100644
--- a/data/json/CompanionDefinition/950.json
+++ b/data/json/CompanionDefinition/950.json
@@ -26,7 +26,7 @@
       "baseValue": 110.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -34,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -62,6 +86,18 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      278,
+      812,
+      638,
+      774,
+      687,
+      95,
+      906,
+      234,
+      942,
+      265
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -166,19 +202,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      278,
-      812,
-      638,
-      774,
-      687,
-      95,
-      906,
-      234,
-      942,
-      265
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "FAMILIER - Suzy",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/966.json b/data/json/CompanionDefinition/966.json
index d07d4ccf617e0a0f894c3ee0cd6c0ce3711c0dbd..c48139b80747eab028d4b8f8eb957b1d38269ff5 100644
--- a/data/json/CompanionDefinition/966.json
+++ b/data/json/CompanionDefinition/966.json
@@ -28,7 +28,7 @@
       "baseValue": 66.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -64,6 +88,18 @@
         "amount": 3000
       }
     ],
+    "skills": [
+      671,
+      879,
+      717,
+      424,
+      129,
+      997,
+      248,
+      14834,
+      602,
+      968
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -168,19 +204,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      671,
-      879,
-      717,
-      424,
-      129,
-      997,
-      248,
-      14834,
-      602,
-      968
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "ENIRIPSA - Angèle",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/968.json b/data/json/CompanionDefinition/968.json
index 73e1be8945f962c234848b9967b82eeab6d805bf..6a07267bc9f53951704db516c397ed16a7c76116 100644
--- a/data/json/CompanionDefinition/968.json
+++ b/data/json/CompanionDefinition/968.json
@@ -41,16 +41,6 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -67,6 +57,24 @@
         14
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -76,6 +84,7 @@
         "amount": 2000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -166,8 +175,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CRA - PALADIR - Héroine Stridulante",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/97.json b/data/json/CompanionDefinition/97.json
index bd8ff9a4ee86b61c8a38cc180a57f4c3b2f27682..671f22e27fd378f4247336c93380f379cfde6776 100644
--- a/data/json/CompanionDefinition/97.json
+++ b/data/json/CompanionDefinition/97.json
@@ -24,7 +24,7 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 70.0,
       "factor": {
@@ -37,28 +37,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -149,8 +158,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - BWORK - Vorti le Rebelle - Ennemi",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/975.json b/data/json/CompanionDefinition/975.json
index 9d1b6f515a40b1c6cf38d1c4d51be6cf29c5f141..691e7d743f6028886f095f5aa61da1e14b72311d 100644
--- a/data/json/CompanionDefinition/975.json
+++ b/data/json/CompanionDefinition/975.json
@@ -26,7 +26,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       0
@@ -41,28 +43,37 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 2,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -153,8 +164,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - CHAFER - Colombe",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/976.json b/data/json/CompanionDefinition/976.json
index 21c9813d2719af7cd9a3e9b90731af29c1e7acbe..0bc3cb33247778fce578b007a1de297893209c57 100644
--- a/data/json/CompanionDefinition/976.json
+++ b/data/json/CompanionDefinition/976.json
@@ -34,7 +34,7 @@
       "baseValue": 59.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -42,25 +42,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 7.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -70,6 +94,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [
       5
     ],
@@ -174,8 +199,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "IOP - Abigaïl",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/98.json b/data/json/CompanionDefinition/98.json
index bf5ceb6b708378377ab01af4cf3f2f0e97d828a1..0ff9c1b2681737419f75b9d1251a0c6205883021 100644
--- a/data/json/CompanionDefinition/98.json
+++ b/data/json/CompanionDefinition/98.json
@@ -38,7 +38,7 @@
       "baseValue": 121.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -46,25 +46,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -80,6 +104,20 @@
         "amount": 6000
       }
     ],
+    "skills": [
+      813,
+      29,
+      187,
+      953,
+      266,
+      892,
+      19024,
+      975,
+      873,
+      881,
+      729,
+      720
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -184,21 +222,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      813,
-      29,
-      187,
-      953,
-      266,
-      892,
-      19024,
-      975,
-      873,
-      881,
-      729,
-      720
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "CHAMPION - Ruel",
   "m_availability": 3,
diff --git a/data/json/CompanionDefinition/980.json b/data/json/CompanionDefinition/980.json
index ae4561004abacdb525ffea8b7ea4249afd05fa21..69a19da264079ef98814a4120dce98ab55716a00 100644
--- a/data/json/CompanionDefinition/980.json
+++ b/data/json/CompanionDefinition/980.json
@@ -36,25 +36,34 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": 0.0
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -145,8 +154,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "QUETE - TOFU - Scar",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/985.json b/data/json/CompanionDefinition/985.json
index cab70acc3e598d40c2f710354f499dbf64b5420e..989c219459322a9e252e53cc06a97dd20603f2b4 100644
--- a/data/json/CompanionDefinition/985.json
+++ b/data/json/CompanionDefinition/985.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -54,6 +62,7 @@
         "amount": 3000
       }
     ],
+    "skills": [],
     "eventsInvalidatingCost": [],
     "eventsInvalidatingCasting": [
       8,
@@ -144,8 +153,7 @@
     },
     "cost": [],
     "autoResurrect": false,
-    "equipableByPlayers": false,
-    "skills": []
+    "equipableByPlayers": false
   },
   "m_displayName": "CHAMPION - Igôle",
   "m_availability": 2,
diff --git a/data/json/CompanionDefinition/99.json b/data/json/CompanionDefinition/99.json
index 82f33c068de897c188b9014785ba7262eaa29bca..b51bf67a2491aa947dedb1a8d10a27d816c3af85 100644
--- a/data/json/CompanionDefinition/99.json
+++ b/data/json/CompanionDefinition/99.json
@@ -32,7 +32,7 @@
       "baseValue": 74.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 6
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 2
+        "reference": 7
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "merchantCosts": [
@@ -68,6 +92,19 @@
         "amount": 4000
       }
     ],
+    "skills": [
+      8549,
+      391,
+      479,
+      8959,
+      56,
+      434,
+      36,
+      704,
+      17902,
+      605,
+      18188
+    ],
     "eventsInvalidatingCost": [
       5
     ],
@@ -181,20 +218,7 @@
       }
     ],
     "autoResurrect": false,
-    "equipableByPlayers": true,
-    "skills": [
-      8549,
-      391,
-      479,
-      8959,
-      56,
-      434,
-      36,
-      704,
-      17902,
-      605,
-      18188
-    ]
+    "equipableByPlayers": true
   },
   "m_displayName": "SADIDA - Épinette",
   "m_availability": 3,
diff --git a/data/json/ConstantsDefinition/25.json b/data/json/ConstantsDefinition/25.json
index 9cb7e0260ed3318234694ef5bd50c81049887cdd..a0982fca41a2c9522cc9dd98cbe560c4c05a9dd7 100644
--- a/data/json/ConstantsDefinition/25.json
+++ b/data/json/ConstantsDefinition/25.json
@@ -10,13 +10,48 @@
       "hasEffects": false,
       "keywordReferences": []
     },
+    "defaultWeaponId": 310,
     "fightConstants": {
       "type": "FightBaseConstants",
-      "monsterStatScalingFactor": 0.1,
-      "monsterSpellScalingFactor": 0.05,
-      "companionStatScalingFactor": 0.025,
-      "summoningStatScalingFactor": 0.05,
-      "mechanismStatScalingFactor": 0.05
+      "championModifiers": [
+        {
+          "type": "PassiveModifier",
+          "modifier": {
+            "type": "LifeModifier"
+          },
+          "value": {
+            "type": "ConstIntegerValue",
+            "referenceId": "",
+            "value": 30
+          }
+        },
+        {
+          "type": "PassiveModifier",
+          "modifier": {
+            "type": "BuffModifier",
+            "caracIds": [
+              58
+            ]
+          },
+          "value": {
+            "type": "ConstIntegerValue",
+            "referenceId": "",
+            "value": 20
+          }
+        }
+      ],
+      "monsterNormalLife": 0.05,
+      "monsterNormalAttack": 0.05,
+      "monsterAssassinLife": 0.06,
+      "monsterAssassinAttack": 0.06,
+      "monsterTankLife": 0.07,
+      "monsterTankAttack": 0.04,
+      "companionLife": 0.03,
+      "companionAttack": 0.03,
+      "summoningLife": 0.05,
+      "summoningAttack": 0.05,
+      "mechanismLife": 0.05,
+      "monsterSpell": 0.02
     },
     "groupConstants": {
       "type": "GroupConstants",
@@ -29,7 +64,7 @@
         {
           "type": "CurrencyCost",
           "currencyType": 0,
-          "amount": 10000
+          "amount": 5000
         }
       ],
       "pointsToIncreaseLevel": [
@@ -45,7 +80,7 @@
     },
     "inventoriesConstants": {
       "type": "InventoriesConstants",
-      "ringInventorySize": 50
+      "ringInventorySize": 200
     },
     "ringConstants": {
       "type": "RingConstants",
@@ -75,11 +110,50 @@
           }
         }
       ],
+      "maxSpendForSkill": [
+        {
+          "k": 0,
+          "v": 100
+        },
+        {
+          "k": 1,
+          "v": 100
+        },
+        {
+          "k": 2,
+          "v": 100
+        },
+        {
+          "k": 4,
+          "v": 100
+        }
+      ],
       "rangeDropSearcher": {
         "type": "MinMax",
         "min": 0,
         "max": 10
       }
+    },
+    "dropConstants": {
+      "type": "DropConstants",
+      "kamaCoefficient": 0.05,
+      "xpCoefficient": 1.04
+    },
+    "namingConstants": {
+      "type": "NamingConstants",
+      "heroNamePattern": "^(?\u003d^\\p{Lu})(?!.*?\\p{Lu} )(?!.* $)(?!.*?\\p{Lu}{2,})[\u0027a-zA-ZÀ-ÖÙ-öù-ÿ ]+$",
+      "heroNameSize": {
+        "type": "MinMax",
+        "min": 3,
+        "max": 18
+      }
+    },
+    "endlessFightsConstants": {
+      "type": "EndlessFightConstants",
+      "minPlayers": 1,
+      "maxPlayers": 3,
+      "maxShopItems": 5,
+      "reRollCurrencyCost": 1
     }
   },
   "m_displayName": "Waven Constants",
diff --git a/data/json/CustomRuleDefinition/120.json b/data/json/CustomRuleDefinition/120.json
index 1b924f0276e65d685125840f13feef67b16a9268..814ed23c14111d54eff025acc7c6fbb8a8adbaf9 100644
--- a/data/json/CustomRuleDefinition/120.json
+++ b/data/json/CustomRuleDefinition/120.json
@@ -11,7 +11,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "v",
-          "value": 3
+          "value": 2
         }
       ],
       "hasEffects": false,
@@ -20,7 +20,7 @@
   },
   "m_displayName": "COCHON - GOLD - Entrainement Intensif",
   "m_availability": 3,
-  "assetGuid": "1399f4123d4dbe841ab3a25fea9f722c",
+  "assetGuid": "870d940b6f0cf2d4e8aa32c5f6dbd10c",
   "m_i18nNameId": 89738,
   "m_i18nDescriptionId": 13409
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/121.json b/data/json/CustomRuleDefinition/121.json
index 550b6f092388e7724522f26cc70800d22978c677..8fb2e437ad36704dd1d6309822bb4d73411c53e4 100644
--- a/data/json/CustomRuleDefinition/121.json
+++ b/data/json/CustomRuleDefinition/121.json
@@ -9,31 +9,46 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
+          "referenceId": "sco",
+          "value": 2
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        {
+          "type": 25,
+          "id": 589
+        }
+      ]
     }
   },
   "m_displayName": "BWORK - SILVER - Reveil du Volcan",
   "m_availability": 3,
-  "assetGuid": "4cd75a7542ee22948befa2fba9051044",
+  "assetGuid": "2208602c983fe4b469bde088238e3132",
   "m_i18nNameId": 38139,
   "m_i18nDescriptionId": 79926
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/128.json b/data/json/CustomRuleDefinition/128.json
index 7fc4882d977f8325d39d0e1e08d1a3dd3700f615..c12aa40af7b39e9bf8eb240d47dc9ad07f2facc5 100644
--- a/data/json/CustomRuleDefinition/128.json
+++ b/data/json/CustomRuleDefinition/128.json
@@ -7,20 +7,19 @@
     "bonusExp": 0,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
+      "dynamicValueReferences": [],
+      "hasEffects": false,
+      "keywordReferences": [
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "perc",
-          "value": 4
+          "type": 6,
+          "id": 1401
         }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
+      ]
     }
   },
-  "m_displayName": "CHAFER - GOLD - Fleuve des Ames",
+  "m_displayName": "CHAFER - GOLD - Marée d\u0027âmes",
   "m_availability": 3,
-  "assetGuid": "82d52a244af361940a5fa3a10a301d4d",
+  "assetGuid": "a717edf8f5373854fb98026916900785",
   "m_i18nNameId": 1586,
   "m_i18nDescriptionId": 16627
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/183.json b/data/json/CustomRuleDefinition/183.json
index c05e041d6e21366ff06c23debb485adc5de00131..fde16be7c80874e1f6292c87e4145428d415c54c 100644
--- a/data/json/CustomRuleDefinition/183.json
+++ b/data/json/CustomRuleDefinition/183.json
@@ -11,16 +11,16 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "v",
-          "value": 2
+          "value": 1
         }
       ],
       "hasEffects": false,
       "keywordReferences": []
     }
   },
-  "m_displayName": "COCHON - SILVER - Exercice Martial",
+  "m_displayName": "COCHON - SILVER - Entrainement Intensif",
   "m_availability": 3,
-  "assetGuid": "f3c235e02323a69499ef9d9947c82fc1",
+  "assetGuid": "b186fd18df091e74b9bde713dc3d56e8",
   "m_i18nNameId": 43685,
   "m_i18nDescriptionId": 85371
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/40.json b/data/json/CustomRuleDefinition/40.json
index 26261255a4a6eb9782f38005f5a2470fa45bdfa6..b8184ef89a665de9266c584fcbb6a56cb12b7c7e 100644
--- a/data/json/CustomRuleDefinition/40.json
+++ b/data/json/CustomRuleDefinition/40.json
@@ -9,31 +9,51 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
+          "referenceId": "pc",
+          "value": 250
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "sco",
+          "value": 1
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        {
+          "type": 25,
+          "id": 589
+        }
+      ]
     }
   },
-  "m_displayName": "BWORK - GOLD - Dechainement du Volcan",
+  "m_displayName": "BWORK - PLATINUM - Dechainement du Volcan",
   "m_availability": 3,
-  "assetGuid": "a15fecd2a7d5633469cc281f5cc21855",
+  "assetGuid": "c1bbed8947a552c44a4540a50f2c8b70",
   "m_i18nNameId": 28073,
   "m_i18nDescriptionId": 23331
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/432.json b/data/json/CustomRuleDefinition/432.json
index 40304f70b525e12c9358f7992046bf963d2c186b..ab444040ba98e370aff1ec70b2ba4fa53c777368 100644
--- a/data/json/CustomRuleDefinition/432.json
+++ b/data/json/CustomRuleDefinition/432.json
@@ -7,20 +7,24 @@
     "bonusExp": 0,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
+      "dynamicValueReferences": [],
+      "hasEffects": false,
+      "keywordReferences": [
+        {
+          "type": 6,
+          "id": 1203
+        },
+        "MECHANISM",
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "type": 7,
+          "id": 249
         }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
+      ]
     }
   },
-  "m_displayName": "CHAFER - GOLD - Vers la mort",
+  "m_displayName": "CHAFER - PLATINUM - Attirance funèbre",
   "m_availability": 3,
-  "assetGuid": "54b16a1bbeaa7bc47961a33ef6c57823",
+  "assetGuid": "b667849a4ab98134abad7cca7212a56b",
   "m_i18nNameId": 69490,
   "m_i18nDescriptionId": 44252
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/55.json b/data/json/CustomRuleDefinition/55.json
index b4c15955f2e3e535bd745352682efabf5d2206e8..ac63857c73553688a74b7e3293274605870b6cc6 100644
--- a/data/json/CustomRuleDefinition/55.json
+++ b/data/json/CustomRuleDefinition/55.json
@@ -7,14 +7,26 @@
     "bonusExp": 0,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "fla",
+          "value": 1
+        }
+      ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        }
+      ]
     }
   },
-  "m_displayName": "BWORK - GOLD - Represaille Violente",
+  "m_displayName": "BWORK - GOLD - Écoulement de lave",
   "m_availability": 3,
-  "assetGuid": "11020aae25e6c0e47b1873c9df4f6607",
+  "assetGuid": "634f0ee99c6d8f6408d62d078e1686cb",
   "m_i18nNameId": 81694,
   "m_i18nDescriptionId": 31539
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/673.json b/data/json/CustomRuleDefinition/673.json
index 9d26554bab40cc7f26a34b6c93c9f85c0a1650ef..2b992f736fd6c579d90be502eb15bfaf14bc4a6a 100644
--- a/data/json/CustomRuleDefinition/673.json
+++ b/data/json/CustomRuleDefinition/673.json
@@ -7,20 +7,19 @@
     "bonusExp": 0,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
+      "dynamicValueReferences": [],
+      "hasEffects": false,
+      "keywordReferences": [
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "perc",
-          "value": 2
+          "type": 6,
+          "id": 1401
         }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
+      ]
     }
   },
-  "m_displayName": "CHAFER - SILVER - Riviere des Ames",
+  "m_displayName": "CHAFER - SILVER - Flot d\u0027âmes",
   "m_availability": 3,
-  "assetGuid": "b6fa0ef7d3e3b164a9ee233289973317",
+  "assetGuid": "1498009427f38c245abfb7e8480926b7",
   "m_i18nNameId": 76025,
   "m_i18nDescriptionId": 20119
 }
\ No newline at end of file
diff --git a/data/json/CustomRuleDefinition/870.json b/data/json/CustomRuleDefinition/870.json
index c5bded72262af9b9d21b76337f5c0a334a3ceaab..a863e937bee7fd3c01a06965243a33cba1d66e12 100644
--- a/data/json/CustomRuleDefinition/870.json
+++ b/data/json/CustomRuleDefinition/870.json
@@ -9,7 +9,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        {
+          "type": 4,
+          "id": 483
+        }
+      ]
     }
   },
   "m_displayName": "COCHON - GOLD - Armee Cochonne",
diff --git a/data/json/DungeonZoneDefinition/1.json b/data/json/DungeonZoneDefinition/1.json
index 67c04792285ce518e8360f82f7aa3a1e1421ff3c..8720ddf43983e7776ebcf728e48c2dab55c2e6dc 100644
--- a/data/json/DungeonZoneDefinition/1.json
+++ b/data/json/DungeonZoneDefinition/1.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 1,
     "iconZone": 1,
+    "chaptersVisualId": 37,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 37,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
diff --git a/data/json/DungeonZoneDefinition/10.json b/data/json/DungeonZoneDefinition/10.json
index 75a7adc81af316277a04adbfc7e98557ff3f2f59..a6a737f9881955c311bb03ec03351411eff65333 100644
--- a/data/json/DungeonZoneDefinition/10.json
+++ b/data/json/DungeonZoneDefinition/10.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 10,
     "iconZone": 1,
+    "chaptersVisualId": 57,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 57,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
diff --git a/data/json/DungeonZoneDefinition/2.json b/data/json/DungeonZoneDefinition/2.json
index ad0b6c7ce302466e72a8c69e14589bef58353cae..ebbd60812a0a298344c1623f4fa13557dd1448cf 100644
--- a/data/json/DungeonZoneDefinition/2.json
+++ b/data/json/DungeonZoneDefinition/2.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 2,
     "iconZone": 1,
+    "chaptersVisualId": 36,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 36,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 25,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 79152,
         "duration": 25,
         "difficulty": 2,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 81640,
         "duration": 35,
         "difficulty": 3,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 77279,
         "duration": 35,
         "difficulty": 4,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 11273,
         "duration": 35,
         "difficulty": 5,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 82854,
         "duration": 50,
         "difficulty": 6,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 12224,
         "duration": 50,
         "difficulty": 7,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 43045,
         "duration": 50,
         "difficulty": 8,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 97053,
         "duration": 65,
         "difficulty": 9,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 1715,
         "duration": 65,
         "difficulty": 10,
diff --git a/data/json/DungeonZoneDefinition/3.json b/data/json/DungeonZoneDefinition/3.json
index be733bfaedeba47d6946c051fa1b1cfd6cda01b5..e27970206500dd8c32ecd9c130057c43ddc3cb14 100644
--- a/data/json/DungeonZoneDefinition/3.json
+++ b/data/json/DungeonZoneDefinition/3.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 3,
     "iconZone": 1,
+    "chaptersVisualId": 37,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 37,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
diff --git a/data/json/DungeonZoneDefinition/4.json b/data/json/DungeonZoneDefinition/4.json
index 8178a4a9c38ba1b74c78dceabbf7b5331cc49c10..b52bd623e4a9d1abe3e51b34a99f4f917f95eb6f 100644
--- a/data/json/DungeonZoneDefinition/4.json
+++ b/data/json/DungeonZoneDefinition/4.json
@@ -5,54 +5,69 @@
     "type": "DungeonZoneDefinition",
     "id": 4,
     "iconZone": 1,
+    "chaptersVisualId": 50,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
-        "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "i18nDescriptionId": 21750,
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 21314,
-        "startsAtChapter": 11,
-        "rules": [
-          183
-        ]
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 38781,
-        "startsAtChapter": 21,
-        "rules": [
-          120,
-          870
-        ]
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 65046,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 52962,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 50,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 25,
-        "difficulty": 1,
+        "difficulty": 2,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 846
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 500,
-                "max": 500
+                "min": 1100,
+                "max": 1100
               }
             }
           },
@@ -63,34 +78,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 101
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -98,59 +107,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 30,
-        "difficulty": 2,
+        "difficulty": 4,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 600,
-                "max": 600
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 11
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 101
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 1200,
+                "max": 1200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -158,59 +172,129 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 30,
-        "difficulty": 3,
+        "difficulty": 6,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 212
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 700,
-                "max": 700
+                "min": 1300,
+                "max": 1300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 101
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 30,
+                "max": 30
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 3,
+        "i18nChapterDescriptionId": 0,
+        "duration": 40,
+        "difficulty": 8,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 392
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1400,
+                "max": 1400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 30,
+                "max": 30
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -218,59 +302,129 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 40,
-        "difficulty": 4,
+        "difficulty": 10,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 99
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 800,
-                "max": 800
+                "min": 1500,
+                "max": 1500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 101
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 5,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 12,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69602
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1600,
+                "max": 1600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -278,59 +432,1234 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
-        "duration": 40,
-        "difficulty": 5,
+        "duration": 50,
+        "difficulty": 14,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 220
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 900,
-                "max": 900
+                "min": 1700,
+                "max": 1700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 101
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 7,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 16,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 761
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1800,
+                "max": 1800
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 8,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 18,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 581
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1900,
+                "max": 1900
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 9,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 20,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 504
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2000,
+                "max": 2000
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 10,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 22,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 846
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2100,
+                "max": 2100
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 35,
+                "max": 35
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 11,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 24,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 11
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2200,
+                "max": 2200
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 35,
+                "max": 35
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 12,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 26,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 212
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2300,
+                "max": 2300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 40,
+                "max": 40
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 13,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 28,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 392
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2400,
+                "max": 2400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 40,
+                "max": 40
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 14,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 30,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 99
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2500,
+                "max": 2500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 15,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 32,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69602
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2600,
+                "max": 2600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 16,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 34,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 220
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2700,
+                "max": 2700
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 17,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 36,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 761
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2800,
+                "max": 2800
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 18,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 38,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 581
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2900,
+                "max": 2900
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 19,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 40,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 504
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3000,
+                "max": 3000
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 20,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 42,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 933
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3100,
+                "max": 3100
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 45,
+                "max": 45
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 21,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 44,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 11
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3200,
+                "max": 3200
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 45,
+                "max": 45
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 22,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 46,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 577
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3300,
+                "max": 3300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 50,
+                "max": 50
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 23,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 48,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 392
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3400,
+                "max": 3400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 50,
+                "max": 50
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 24,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 50,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 176
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3500,
+                "max": 3500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -338,119 +1667,129 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 25,
         "i18nChapterDescriptionId": 0,
-        "duration": 50,
-        "difficulty": 6,
+        "duration": 60,
+        "difficulty": 52,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69602
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1000,
-                "max": 1000
+                "min": 3600,
+                "max": 3600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 101
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
-          },
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 26,
+        "i18nChapterDescriptionId": 0,
+        "duration": 60,
+        "difficulty": 54,
+        "rewards": [
           {
             "type": "SimpleLootEntry",
             "dropChance": 6.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 32,
+                "value": 881
               }
             }
-          }
-        ]
-      },
-      {
-        "type": "DungeonChapterDefinition",
-        "chapterId": 7,
-        "i18nChapterDescriptionId": 0,
-        "duration": 50,
-        "difficulty": 7,
-        "rewards": [
+          },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 40.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1100,
-                "max": 1100
+                "min": 3700,
+                "max": 3700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 101
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 7.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -458,59 +1797,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 27,
         "i18nChapterDescriptionId": 0,
-        "duration": 50,
-        "difficulty": 8,
+        "duration": 60,
+        "difficulty": 56,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1200,
-                "max": 1200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 761
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 101
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 3800,
+                "max": 3800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -518,59 +1862,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 28,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 9,
+        "difficulty": 58,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1300,
-                "max": 1300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 569
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 101
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 3900,
+                "max": 3900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -578,59 +1927,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 29,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 10,
+        "difficulty": 60,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1400,
-                "max": 1400
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 504
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 101
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 4000,
+                "max": 4000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 846
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 764
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -638,59 +1992,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 11,
+        "chapterIndex": 30,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 11,
+        "difficulty": 63,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1500,
-                "max": 1500
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 933
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4100,
+                "max": 4100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 60,
+                "max": 60
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -698,59 +2057,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 12,
+        "chapterIndex": 31,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 12,
+        "difficulty": 66,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1600,
-                "max": 1600
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 11
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4200,
+                "max": 4200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 65,
+                "max": 65
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -758,59 +2122,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 13,
+        "chapterIndex": 32,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 13,
+        "difficulty": 69,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1700,
-                "max": 1700
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 577
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4300,
+                "max": 4300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 70,
+                "max": 70
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -818,59 +2187,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 14,
+        "chapterIndex": 33,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 14,
+        "difficulty": 72,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1800,
-                "max": 1800
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 392
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4400,
+                "max": 4400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 75,
+                "max": 75
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -878,59 +2252,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 15,
+        "chapterIndex": 34,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 15,
+        "difficulty": 75,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1900,
-                "max": 1900
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 176
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4500,
+                "max": 4500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -938,59 +2317,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 16,
+        "chapterIndex": 35,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 16,
+        "difficulty": 78,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2000,
-                "max": 2000
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69602
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4600,
+                "max": 4600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -998,59 +2382,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 17,
+        "chapterIndex": 36,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 17,
+        "difficulty": 81,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2100,
-                "max": 2100
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 881
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4700,
+                "max": 4700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1058,59 +2447,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 18,
+        "chapterIndex": 37,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 18,
+        "difficulty": 84,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2200,
-                "max": 2200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 761
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4800,
+                "max": 4800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1118,59 +2512,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 19,
+        "chapterIndex": 38,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 19,
+        "difficulty": 87,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2300,
-                "max": 2300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 569
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4900,
+                "max": 4900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1178,59 +2577,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 20,
+        "chapterIndex": 39,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 20,
+        "difficulty": 90,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2400,
-                "max": 2400
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 504
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 232
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 5000,
+                "max": 5000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 99
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 760
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1238,11 +2642,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 21,
+        "chapterIndex": 40,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 21,
+        "difficulty": 94,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 933
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1251,46 +2666,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2500,
-                "max": 2500
+                "min": 5100,
+                "max": 5100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 0.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 80,
+                "max": 80
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1298,11 +2707,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 22,
+        "chapterIndex": 41,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 22,
+        "difficulty": 98,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 11
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1311,46 +2731,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2600,
-                "max": 2600
+                "min": 5200,
+                "max": 5200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 85,
+                "max": 85
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1358,11 +2772,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 23,
+        "chapterIndex": 42,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 23,
+        "difficulty": 102,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 577
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1371,46 +2796,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2700,
-                "max": 2700
+                "min": 5300,
+                "max": 5300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 90,
+                "max": 90
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1418,11 +2837,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 24,
+        "chapterIndex": 43,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 24,
+        "difficulty": 106,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 392
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1431,46 +2861,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2800,
-                "max": 2800
+                "min": 5400,
+                "max": 5400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 100,
+                "max": 100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1478,11 +2902,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 25,
+        "chapterIndex": 44,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 25,
+        "difficulty": 110,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 176
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1491,46 +2926,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2900,
-                "max": 2900
+                "min": 5500,
+                "max": 5500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1538,11 +2967,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 26,
+        "chapterIndex": 45,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 26,
+        "difficulty": 114,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69602
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1551,8 +2991,8 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3000,
-                "max": 3000
+                "min": 5600,
+                "max": 5600
               }
             }
           },
@@ -1563,34 +3003,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1598,11 +3032,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 27,
+        "chapterIndex": 46,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 27,
+        "difficulty": 118,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 881
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1611,46 +3056,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3100,
-                "max": 3100
+                "min": 5700,
+                "max": 5700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1658,11 +3097,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 28,
+        "chapterIndex": 47,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 28,
+        "difficulty": 122,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 761
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1671,46 +3121,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3200,
-                "max": 3200
+                "min": 5800,
+                "max": 5800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1718,11 +3162,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 29,
+        "chapterIndex": 48,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 29,
+        "difficulty": 126,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 569
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1731,46 +3186,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3300,
-                "max": 3300
+                "min": 5900,
+                "max": 5900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 41
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1778,11 +3227,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 30,
+        "chapterIndex": 49,
         "i18nChapterDescriptionId": 0,
         "duration": 60,
-        "difficulty": 30,
+        "difficulty": 130,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 504
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1791,46 +3251,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3400,
-                "max": 3400
+                "min": 6000,
+                "max": 6000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 532
+                "value": 41
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 5.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 22
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 382
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
diff --git a/data/json/DungeonZoneDefinition/5.json b/data/json/DungeonZoneDefinition/5.json
index 80f4046f3529fdb58f1bdc21c94963ea99b77278..ba95871008ce6b369a652fecafea8475c585dd73 100644
--- a/data/json/DungeonZoneDefinition/5.json
+++ b/data/json/DungeonZoneDefinition/5.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 5,
     "iconZone": 1,
+    "chaptersVisualId": 51,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 51,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 56612,
         "duration": 25,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -116,6 +125,6 @@
     "maxPlayers": 3
   },
   "m_displayName": "DONJON - Gelée",
-  "m_availability": 2,
+  "m_availability": 0,
   "m_i18nNameId": 44197
 }
\ No newline at end of file
diff --git a/data/json/DungeonZoneDefinition/6.json b/data/json/DungeonZoneDefinition/6.json
index 81af39621ca90b5995ad61a122842c72248fa71c..3afa84f47f4d9bf83d09291b529bc9e918ad9423 100644
--- a/data/json/DungeonZoneDefinition/6.json
+++ b/data/json/DungeonZoneDefinition/6.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 6,
     "iconZone": 1,
+    "chaptersVisualId": 41,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 41,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 25,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 25,
         "difficulty": 2,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 25,
         "difficulty": 3,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 40,
         "difficulty": 4,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 40,
         "difficulty": 5,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 55,
         "difficulty": 6,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
         "duration": 55,
         "difficulty": 7,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 0,
         "duration": 55,
         "difficulty": 8,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
         "difficulty": 9,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
         "difficulty": 10,
diff --git a/data/json/DungeonZoneDefinition/7.json b/data/json/DungeonZoneDefinition/7.json
index 377fd6b8985f12466a18086183ff614ccc62118e..1b774c17c5368c6f20bc96e779e9d0492a1f65f4 100644
--- a/data/json/DungeonZoneDefinition/7.json
+++ b/data/json/DungeonZoneDefinition/7.json
@@ -5,55 +5,69 @@
     "type": "DungeonZoneDefinition",
     "id": 7,
     "iconZone": 1,
+    "chaptersVisualId": 49,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
-        "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "i18nDescriptionId": 49068,
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 6552,
-        "startsAtChapter": 11,
-        "rules": [
-          121,
-          263
-        ]
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 54848,
-        "startsAtChapter": 21,
-        "rules": [
-          40,
-          55
-        ]
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 42981,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 25698,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 49,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 27892,
         "duration": 20,
-        "difficulty": 1,
+        "difficulty": 2,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 124
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 500,
-                "max": 500
+                "min": 1100,
+                "max": 1100
               }
             }
           },
@@ -64,34 +78,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -99,59 +107,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 24784,
         "duration": 20,
-        "difficulty": 2,
+        "difficulty": 4,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 600,
-                "max": 600
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67282
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 222
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 1200,
+                "max": 1200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -159,59 +172,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 43128,
         "duration": 25,
-        "difficulty": 3,
+        "difficulty": 6,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 700,
-                "max": 700
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 741
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 222
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 1300,
+                "max": 1300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 30,
+                "max": 30
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -219,59 +237,129 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 49550,
         "duration": 30,
-        "difficulty": 4,
+        "difficulty": 8,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 312
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 800,
-                "max": 800
+                "min": 1400,
+                "max": 1400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 30,
+                "max": 30
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 4,
+        "i18nChapterDescriptionId": 33652,
+        "duration": 35,
+        "difficulty": 10,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 5,
-                "value": 124
+                "value": 538
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1500,
+                "max": 1500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -279,59 +367,1299 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
-        "i18nChapterDescriptionId": 33652,
-        "duration": 35,
-        "difficulty": 5,
+        "chapterIndex": 5,
+        "i18nChapterDescriptionId": 43523,
+        "duration": 40,
+        "difficulty": 12,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67393
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 900,
-                "max": 900
+                "min": 1600,
+                "max": 1600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 6,
+        "i18nChapterDescriptionId": 87525,
+        "duration": 40,
+        "difficulty": 14,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 628
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1700,
+                "max": 1700
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 7,
+        "i18nChapterDescriptionId": 98571,
+        "duration": 45,
+        "difficulty": 16,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 972
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1800,
+                "max": 1800
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 8,
+        "i18nChapterDescriptionId": 55764,
+        "duration": 45,
+        "difficulty": 18,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 128
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1900,
+                "max": 1900
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 9,
+        "i18nChapterDescriptionId": 6364,
+        "duration": 50,
+        "difficulty": 20,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 176
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2000,
+                "max": 2000
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 10,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 22,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 124
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2100,
+                "max": 2100
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 35,
+                "max": 35
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 11,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 24,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67282
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2200,
+                "max": 2200
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 35,
+                "max": 35
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 12,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 26,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 741
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2300,
+                "max": 2300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 40,
+                "max": 40
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 13,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 28,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 312
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2400,
+                "max": 2400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 40,
+                "max": 40
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 14,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 30,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 538
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2500,
+                "max": 2500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 15,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 32,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67393
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2600,
+                "max": 2600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 16,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 34,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 628
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2700,
+                "max": 2700
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 17,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 36,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 972
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2800,
+                "max": 2800
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 18,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 38,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 128
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2900,
+                "max": 2900
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 19,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 40,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 176
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3000,
+                "max": 3000
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 20,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 42,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 753
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3100,
+                "max": 3100
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 45,
+                "max": 45
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 21,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 44,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67282
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3200,
+                "max": 3200
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 45,
+                "max": 45
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 22,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 46,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 272
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3300,
+                "max": 3300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 50,
+                "max": 50
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 23,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 48,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 312
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3400,
+                "max": 3400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 50,
+                "max": 50
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 24,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 50,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 664
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3500,
+                "max": 3500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -339,239 +1667,259 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
-        "i18nChapterDescriptionId": 43523,
-        "duration": 40,
-        "difficulty": 6,
+        "chapterIndex": 25,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 52,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67393
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1000,
-                "max": 1000
+                "min": 3600,
+                "max": 3600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
-          },
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 26,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 54,
+        "rewards": [
           {
             "type": "SimpleLootEntry",
             "dropChance": 6.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 32,
+                "value": 54
               }
             }
-          }
-        ]
-      },
-      {
-        "type": "DungeonChapterDefinition",
-        "chapterId": 7,
-        "i18nChapterDescriptionId": 87525,
-        "duration": 40,
-        "difficulty": 7,
-        "rewards": [
+          },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 40.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1100,
-                "max": 1100
+                "min": 3700,
+                "max": 3700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
-          },
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 27,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 56,
+        "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 6.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 25,
+                "value": 972
               }
             }
-          }
-        ]
-      },
-      {
-        "type": "DungeonChapterDefinition",
-        "chapterId": 8,
-        "i18nChapterDescriptionId": 98571,
-        "duration": 45,
-        "difficulty": 8,
-        "rewards": [
+          },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 40.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1200,
-                "max": 1200
+                "min": 3800,
+                "max": 3800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
-          },
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 28,
+        "i18nChapterDescriptionId": 0,
+        "duration": 50,
+        "difficulty": 58,
+        "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 6.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 32,
+                "value": 396
               }
             }
-          }
-        ]
-      },
-      {
-        "type": "DungeonChapterDefinition",
-        "chapterId": 9,
-        "i18nChapterDescriptionId": 55764,
-        "duration": 45,
-        "difficulty": 9,
-        "rewards": [
+          },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 40.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1300,
-                "max": 1300
+                "min": 3900,
+                "max": 3900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 222
+                "value": 41
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 9.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -579,59 +1927,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
-        "i18nChapterDescriptionId": 6364,
+        "chapterIndex": 29,
+        "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 10,
+        "difficulty": 60,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1400,
-                "max": 1400
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 176
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 222
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 4000,
+                "max": 4000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 124
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 878
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -639,59 +1992,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 11,
+        "chapterIndex": 30,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 11,
+        "difficulty": 63,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1500,
-                "max": 1500
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 753
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4100,
+                "max": 4100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 60,
+                "max": 60
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -699,59 +2057,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 12,
+        "chapterIndex": 31,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 12,
+        "difficulty": 66,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1600,
-                "max": 1600
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67282
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4200,
+                "max": 4200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 65,
+                "max": 65
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -759,59 +2122,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 13,
+        "chapterIndex": 32,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 13,
+        "difficulty": 69,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1700,
-                "max": 1700
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 272
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4300,
+                "max": 4300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 70,
+                "max": 70
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -819,59 +2187,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 14,
+        "chapterIndex": 33,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 14,
+        "difficulty": 72,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1800,
-                "max": 1800
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 312
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4400,
+                "max": 4400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 75,
+                "max": 75
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -879,59 +2252,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 15,
+        "chapterIndex": 34,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 15,
+        "difficulty": 75,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1900,
-                "max": 1900
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 664
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4500,
+                "max": 4500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -939,59 +2317,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 16,
+        "chapterIndex": 35,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 16,
+        "difficulty": 78,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2000,
-                "max": 2000
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67393
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4600,
+                "max": 4600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -999,59 +2382,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 17,
+        "chapterIndex": 36,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 17,
+        "difficulty": 81,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2100,
-                "max": 2100
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 54
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4700,
+                "max": 4700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1059,59 +2447,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 18,
+        "chapterIndex": 37,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 18,
+        "difficulty": 84,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2200,
-                "max": 2200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 972
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4800,
+                "max": 4800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1119,59 +2512,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 19,
+        "chapterIndex": 38,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 19,
+        "difficulty": 87,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2300,
-                "max": 2300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 396
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4900,
+                "max": 4900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1179,59 +2577,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 20,
+        "chapterIndex": 39,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 20,
+        "difficulty": 90,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2400,
-                "max": 2400
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 176
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 286
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 5000,
+                "max": 5000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 538
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 137
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1239,11 +2642,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 21,
+        "chapterIndex": 40,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 21,
+        "difficulty": 94,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 753
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1252,46 +2666,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2500,
-                "max": 2500
+                "min": 5100,
+                "max": 5100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 0.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 80,
+                "max": 80
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1299,11 +2707,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 22,
+        "chapterIndex": 41,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 22,
+        "difficulty": 98,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67282
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1312,46 +2731,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2600,
-                "max": 2600
+                "min": 5200,
+                "max": 5200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 85,
+                "max": 85
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1359,11 +2772,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 23,
+        "chapterIndex": 42,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 23,
+        "difficulty": 102,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 272
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1372,46 +2796,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2700,
-                "max": 2700
+                "min": 5300,
+                "max": 5300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 90,
+                "max": 90
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1419,11 +2837,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 24,
+        "chapterIndex": 43,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 24,
+        "difficulty": 106,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 312
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1432,46 +2861,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2800,
-                "max": 2800
+                "min": 5400,
+                "max": 5400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 100,
+                "max": 100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1479,11 +2902,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 25,
+        "chapterIndex": 44,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 25,
+        "difficulty": 110,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 664
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1492,46 +2926,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2900,
-                "max": 2900
+                "min": 5500,
+                "max": 5500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1539,11 +2967,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 26,
+        "chapterIndex": 45,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 26,
+        "difficulty": 114,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67393
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1552,8 +2991,8 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3000,
-                "max": 3000
+                "min": 5600,
+                "max": 5600
               }
             }
           },
@@ -1564,34 +3003,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1599,11 +3032,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 27,
+        "chapterIndex": 46,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 27,
+        "difficulty": 118,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 54
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1612,46 +3056,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3100,
-                "max": 3100
+                "min": 5700,
+                "max": 5700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1659,11 +3097,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 28,
+        "chapterIndex": 47,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 28,
+        "difficulty": 122,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 972
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1672,46 +3121,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3200,
-                "max": 3200
+                "min": 5800,
+                "max": 5800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1719,11 +3162,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 29,
+        "chapterIndex": 48,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 29,
+        "difficulty": 126,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 396
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1732,46 +3186,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3300,
-                "max": 3300
+                "min": 5900,
+                "max": 5900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 41
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1779,11 +3227,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 30,
+        "chapterIndex": 49,
         "i18nChapterDescriptionId": 0,
         "duration": 50,
-        "difficulty": 30,
+        "difficulty": 130,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 176
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1792,46 +3251,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3400,
-                "max": 3400
+                "min": 6000,
+                "max": 6000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 728
+                "value": 41
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 5.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 133
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 35
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
diff --git a/data/json/DungeonZoneDefinition/8.json b/data/json/DungeonZoneDefinition/8.json
index 9ddaed4b52d8a3e045d6990c18d591e5a19f4f38..df94d8e4abd7d17acf777485c16014641b578273 100644
--- a/data/json/DungeonZoneDefinition/8.json
+++ b/data/json/DungeonZoneDefinition/8.json
@@ -5,35 +5,44 @@
     "type": "DungeonZoneDefinition",
     "id": 8,
     "iconZone": 1,
+    "chaptersVisualId": 52,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 52,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 1,
@@ -41,7 +50,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 2,
@@ -49,7 +58,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 3,
@@ -57,7 +66,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 4,
@@ -65,7 +74,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 5,
@@ -73,7 +82,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 6,
@@ -81,7 +90,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 7,
@@ -89,7 +98,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 8,
@@ -97,7 +106,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 9,
@@ -105,7 +114,7 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nChapterDescriptionId": 0,
         "duration": 1,
         "difficulty": 10,
diff --git a/data/json/DungeonZoneDefinition/9.json b/data/json/DungeonZoneDefinition/9.json
index 3ff4630296af3a88a9b9bfe6f80a43a1c0af8de6..141b220e0e992696c23156abec9dca1ed9decec1 100644
--- a/data/json/DungeonZoneDefinition/9.json
+++ b/data/json/DungeonZoneDefinition/9.json
@@ -5,54 +5,69 @@
     "type": "DungeonZoneDefinition",
     "id": 9,
     "iconZone": 1,
+    "chaptersVisualId": 40,
     "ranks": {
       "type": "AdventureRank",
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 98332,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 92082,
-        "startsAtChapter": 11,
-        "rules": [
-          673
-        ]
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 52057,
-        "startsAtChapter": 21,
-        "rules": [
-          128,
-          432
-        ]
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 42302,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 35821,
+        "startsAtChapter": 41
       }
     },
-    "relatedFamily": 40,
     "chapters": [
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nChapterDescriptionId": 56612,
         "duration": 25,
-        "difficulty": 1,
+        "difficulty": 2,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 359
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 500,
-                "max": 500
+                "min": 1100,
+                "max": 1100
               }
             }
           },
@@ -67,30 +82,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -98,27 +107,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nChapterDescriptionId": 1419,
         "duration": 25,
-        "difficulty": 2,
+        "difficulty": 4,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 440
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 600,
-                "max": 600
+                "min": 1200,
+                "max": 1200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -127,30 +147,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -158,27 +172,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nChapterDescriptionId": 0,
         "duration": 25,
-        "difficulty": 3,
+        "difficulty": 6,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 371
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 700,
-                "max": 700
+                "min": 1300,
+                "max": 1300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -187,30 +212,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "min": 30,
+                "max": 30
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -218,27 +237,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nChapterDescriptionId": 0,
         "duration": 40,
-        "difficulty": 4,
+        "difficulty": 8,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 324
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 800,
-                "max": 800
+                "min": 1400,
+                "max": 1400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -247,30 +277,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 30,
+                "max": 30
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 359
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -278,59 +302,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nChapterDescriptionId": 0,
         "duration": 40,
-        "difficulty": 5,
+        "difficulty": 10,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 900,
-                "max": 900
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 769
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 152
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 1500,
+                "max": 1500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -338,59 +367,1364 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nChapterDescriptionId": 0,
         "duration": 55,
-        "difficulty": 6,
+        "difficulty": 12,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 491
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1000,
-                "max": 1000
+                "min": 1600,
+                "max": 1600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 152
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 6,
+        "i18nChapterDescriptionId": 0,
+        "duration": 55,
+        "difficulty": 14,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1700,
+                "max": 1700
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 7,
+        "i18nChapterDescriptionId": 0,
+        "duration": 55,
+        "difficulty": 16,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70760
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1800,
+                "max": 1800
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 5,
+                "max": 5
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 8,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 18,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 305
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 1900,
+                "max": 1900
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 9,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 20,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 625
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2000,
+                "max": 2000
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 10,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 22,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 359
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2100,
+                "max": 2100
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 35,
+                "max": 35
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 11,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 24,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 440
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2200,
+                "max": 2200
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 35,
+                "max": 35
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 12,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 26,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 371
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2300,
+                "max": 2300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 40,
+                "max": 40
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 13,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 28,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 324
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2400,
+                "max": 2400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 40,
+                "max": 40
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 14,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 30,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 769
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2500,
+                "max": 2500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 15,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 32,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 491
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2600,
+                "max": 2600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 16,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 34,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2700,
+                "max": 2700
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 17,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 36,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70760
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2800,
+                "max": 2800
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 18,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 38,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 305
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 2900,
+                "max": 2900
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 19,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 40,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 625
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3000,
+                "max": 3000
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 20,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 42,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 642
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3100,
+                "max": 3100
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 45,
+                "max": 45
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 21,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 44,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 440
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3200,
+                "max": 3200
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 45,
+                "max": 45
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 22,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 46,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 904
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3300,
+                "max": 3300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 50,
+                "max": 50
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 23,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 48,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 324
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3400,
+                "max": 3400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 50,
+                "max": 50
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 24,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 50,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 339
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3500,
+                "max": 3500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "DungeonChapterDefinition",
+        "chapterIndex": 25,
+        "i18nChapterDescriptionId": 0,
+        "duration": 65,
+        "difficulty": 52,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 491
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 3600,
+                "max": 3600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -398,59 +1732,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 26,
         "i18nChapterDescriptionId": 0,
-        "duration": 55,
-        "difficulty": 7,
+        "duration": 65,
+        "difficulty": 54,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1100,
-                "max": 1100
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 13
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 152
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 3700,
+                "max": 3700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -458,59 +1797,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 27,
         "i18nChapterDescriptionId": 0,
-        "duration": 55,
-        "difficulty": 8,
+        "duration": 65,
+        "difficulty": 56,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1200,
-                "max": 1200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70760
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 152
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 3800,
+                "max": 3800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "typeEnum": 23,
+                "value": 179
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -518,59 +1862,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 28,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 9,
+        "difficulty": 58,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1300,
-                "max": 1300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 529
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 152
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 3900,
+                "max": 3900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -578,59 +1927,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 29,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 10,
+        "difficulty": 60,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1400,
-                "max": 1400
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 625
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 152
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 40,
-                "max": 40
+                "min": 4000,
+                "max": 4000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 359
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 966
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -638,59 +1992,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 11,
+        "chapterIndex": 30,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 11,
+        "difficulty": 63,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1500,
-                "max": 1500
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 642
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 179
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4100,
+                "max": 4100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 60,
+                "max": 60
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -698,59 +2057,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 12,
+        "chapterIndex": 31,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 12,
+        "difficulty": 66,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1600,
-                "max": 1600
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 440
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 179
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4200,
+                "max": 4200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 65,
+                "max": 65
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -758,59 +2122,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 13,
+        "chapterIndex": 32,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 13,
+        "difficulty": 69,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1700,
-                "max": 1700
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 904
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 179
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4300,
+                "max": 4300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 70,
+                "max": 70
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -818,59 +2187,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 14,
+        "chapterIndex": 33,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 14,
+        "difficulty": 72,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 1800,
-                "max": 1800
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 324
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 179
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
-                "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "type": "MinMax",
+                "min": 4400,
+                "max": 4400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 75,
+                "max": 75
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -878,27 +2252,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 15,
+        "chapterIndex": 34,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 15,
+        "difficulty": 75,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 339
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1900,
-                "max": 1900
+                "min": 4500,
+                "max": 4500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -907,30 +2292,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -938,27 +2317,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 16,
+        "chapterIndex": 35,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 16,
+        "difficulty": 78,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 491
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2000,
-                "max": 2000
+                "min": 4600,
+                "max": 4600
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -967,30 +2357,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -998,27 +2382,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 17,
+        "chapterIndex": 36,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 17,
+        "difficulty": 81,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 13
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2100,
-                "max": 2100
+                "min": 4700,
+                "max": 4700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1027,30 +2422,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1058,27 +2447,38 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 18,
+        "chapterIndex": 37,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 18,
+        "difficulty": 84,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70760
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2200,
-                "max": 2200
+                "min": 4800,
+                "max": 4800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1087,30 +2487,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1118,59 +2512,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 19,
+        "chapterIndex": 38,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 19,
+        "difficulty": 87,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 12.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2300,
-                "max": 2300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 529
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 179
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 4900,
+                "max": 4900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1178,59 +2577,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 20,
+        "chapterIndex": 39,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 20,
+        "difficulty": 90,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 8.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2400,
-                "max": 2400
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 625
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 179
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 10,
-                "max": 10
+                "min": 5000,
+                "max": 5000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 769
+                "typeEnum": 23,
+                "value": 41
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 511
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1238,11 +2642,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 21,
+        "chapterIndex": 40,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 21,
+        "difficulty": 94,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 642
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1251,46 +2666,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2500,
-                "max": 2500
+                "min": 5100,
+                "max": 5100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 0.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 80,
+                "max": 80
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1298,59 +2707,64 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 22,
+        "chapterIndex": 41,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 22,
+        "difficulty": 98,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 10.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 2600,
-                "max": 2600
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 440
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 50.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 41
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
+                "min": 5200,
+                "max": 5200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "typeEnum": 23,
+                "value": 152
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 85,
+                "max": 85
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1358,11 +2772,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 23,
+        "chapterIndex": 42,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 23,
+        "difficulty": 102,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 904
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1371,46 +2796,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2700,
-                "max": 2700
+                "min": 5300,
+                "max": 5300
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 90,
+                "max": 90
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1418,11 +2837,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 24,
+        "chapterIndex": 43,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 24,
+        "difficulty": 106,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 324
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1431,46 +2861,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2800,
-                "max": 2800
+                "min": 5400,
+                "max": 5400
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 152
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 100,
+                "max": 100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1478,11 +2902,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 25,
+        "chapterIndex": 44,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 25,
+        "difficulty": 110,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 339
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1491,46 +2926,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2900,
-                "max": 2900
+                "min": 5500,
+                "max": 5500
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1538,11 +2967,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 26,
+        "chapterIndex": 45,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 26,
+        "difficulty": 114,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 491
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1551,8 +2991,8 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3000,
-                "max": 3000
+                "min": 5600,
+                "max": 5600
               }
             }
           },
@@ -1563,34 +3003,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1598,11 +3032,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 27,
+        "chapterIndex": 46,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 27,
+        "difficulty": 118,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 13
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1611,46 +3056,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3100,
-                "max": 3100
+                "min": 5700,
+                "max": 5700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1658,11 +3097,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 28,
+        "chapterIndex": 47,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 28,
+        "difficulty": 122,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70760
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1671,46 +3121,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3200,
-                "max": 3200
+                "min": 5800,
+                "max": 5800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 41
+                "value": 179
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 25,
+                "max": 25
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1718,11 +3162,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 29,
+        "chapterIndex": 48,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 29,
+        "difficulty": 126,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 20.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 529
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1731,14 +3186,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3300,
-                "max": 3300
+                "min": 5900,
+                "max": 5900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1747,30 +3202,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
@@ -1778,11 +3227,22 @@
       },
       {
         "type": "DungeonChapterDefinition",
-        "chapterId": 30,
+        "chapterIndex": 49,
         "i18nChapterDescriptionId": 0,
         "duration": 65,
-        "difficulty": 30,
+        "difficulty": 130,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 625
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1791,14 +3251,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 3400,
-                "max": 3400
+                "min": 6000,
+                "max": 6000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1807,30 +3267,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 5,
-                "max": 5
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 5.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 12
+                "min": 2,
+                "max": 2
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 790
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
               }
             }
           }
diff --git a/data/json/FamilyDefinition/36.json b/data/json/FamilyDefinition/36.json
index 30f19e400e547c788cb01052a77a74aa7d7b22a6..c2cebc4b1956346f907af07a7352980f6ea9b80d 100644
--- a/data/json/FamilyDefinition/36.json
+++ b/data/json/FamilyDefinition/36.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Bouftou",
   "m_availability": 2,
-  "assetGuid": "d81667edc3a6159469c78de582730cda",
-  "size": 10
+  "size": 10,
+  "assetGuid": "d81667edc3a6159469c78de582730cda"
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/37.json b/data/json/FamilyDefinition/37.json
index 1590a9fa6b17975af8d7cd2cee3d05ee2df58af7..f2fbc231b7071e8cc3bb347f5b9de7ecd8d0a84e 100644
--- a/data/json/FamilyDefinition/37.json
+++ b/data/json/FamilyDefinition/37.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Tofu",
   "m_availability": 2,
-  "assetGuid": "",
-  "size": 10
+  "size": 10,
+  "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/40.json b/data/json/FamilyDefinition/40.json
index 6f6bc4b59f4a1139d2517147083d2779b866955f..0ea0c218792db695a8b7c5e18c449cbbd5d13dfe 100644
--- a/data/json/FamilyDefinition/40.json
+++ b/data/json/FamilyDefinition/40.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Chafer",
   "m_availability": 3,
-  "assetGuid": "a9205a9a6c5c7c74cabf021da264d94f",
-  "size": 10
+  "size": 10,
+  "assetGuid": "a9205a9a6c5c7c74cabf021da264d94f"
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/41.json b/data/json/FamilyDefinition/41.json
index 75c51a28a4dde90d431ec6b176e46edf70a90844..353092aa88875fedaa5a0a54ec9426ca4e5b7158 100644
--- a/data/json/FamilyDefinition/41.json
+++ b/data/json/FamilyDefinition/41.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Craqueleurs",
   "m_availability": 2,
-  "assetGuid": "a9205a9a6c5c7c74cabf021da264d94f",
-  "size": 10
+  "size": 10,
+  "assetGuid": "a9205a9a6c5c7c74cabf021da264d94f"
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/49.json b/data/json/FamilyDefinition/49.json
index e22be207cc99f64718675cb9ccf0d9f74224289a..f98033584aa4e992e1eae3371171e9ff1497e0f5 100644
--- a/data/json/FamilyDefinition/49.json
+++ b/data/json/FamilyDefinition/49.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Bwork",
   "m_availability": 3,
-  "assetGuid": "5bf5fffc2ed13974496e34e2d76d8c71",
-  "size": 10
+  "size": 10,
+  "assetGuid": "5bf5fffc2ed13974496e34e2d76d8c71"
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/50.json b/data/json/FamilyDefinition/50.json
index 235ec53fd5303f3c2a3280d1edb3890273f42e28..20665a19150b1c04beb5c83d42c72001fd4cb536 100644
--- a/data/json/FamilyDefinition/50.json
+++ b/data/json/FamilyDefinition/50.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Cochon",
   "m_availability": 3,
-  "assetGuid": "3ef908a508f494914b3e86ee73fdfe01",
-  "size": 10
+  "size": 10,
+  "assetGuid": "3ef908a508f494914b3e86ee73fdfe01"
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/52.json b/data/json/FamilyDefinition/52.json
index f015a3ebf702091fd03674d123a6771dcf1cfaac..84fb31a62ef5976804a100fb74f8149fd3514c3a 100644
--- a/data/json/FamilyDefinition/52.json
+++ b/data/json/FamilyDefinition/52.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Chuchoteur",
   "m_availability": 2,
-  "assetGuid": "",
-  "size": 10
+  "size": 10,
+  "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/FamilyDefinition/57.json b/data/json/FamilyDefinition/57.json
index 42586a9bb160f73f5b959b1ed5dfc24e5507d30a..f99c275cc125777e760a07a173ebbe5ebff8363c 100644
--- a/data/json/FamilyDefinition/57.json
+++ b/data/json/FamilyDefinition/57.json
@@ -19,6 +19,6 @@
   },
   "m_displayName": "Ecailleux",
   "m_availability": 2,
-  "assetGuid": "",
-  "size": 10
+  "size": 10,
+  "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/FloatingCounterCustomEffectDefinition/100.json b/data/json/FloatingCounterCustomEffectDefinition/100.json
index f2fc270a3d2ca2dcf36f54ef4132168a1781ef22..6f02fd3235bbbac128736d90e99e39ffab774d82 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/100.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/100.json
@@ -11,11 +11,6 @@
           "type": "ConstIntegerValue",
           "referenceId": "mireDmg",
           "value": 11
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "mireBoostHeal",
-          "value": 11
         }
       ],
       "hasEffects": false,
diff --git a/data/json/FloatingCounterCustomEffectDefinition/101.json b/data/json/FloatingCounterCustomEffectDefinition/101.json
index 4744507e61893576771450fb4fc852df40be9d3b..60862e3fe87f614d4f3872de7978bda4b3ca4c98 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/101.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/101.json
@@ -11,6 +11,11 @@
           "type": "ConstIntegerValue",
           "referenceId": "mireDmg",
           "value": 11
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ex",
+          "value": 10
         }
       ],
       "hasEffects": false,
diff --git a/data/json/FloatingCounterCustomEffectDefinition/102.json b/data/json/FloatingCounterCustomEffectDefinition/102.json
index 1795e5abeb98336403b3bf17c6390dc8d8a71770..934e0fc37d5976c8d906100d172d2cc30536d975 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/102.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/102.json
@@ -11,6 +11,11 @@
           "type": "ConstIntegerValue",
           "referenceId": "mireDmg",
           "value": 11
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": -1
         }
       ],
       "hasEffects": false,
diff --git a/data/json/FloatingCounterCustomEffectDefinition/77.json b/data/json/FloatingCounterCustomEffectDefinition/77.json
index 7e81e6bb0cc9bee0a551920ef2196cf54076ca1a..5c7e4232121fc435419effcaec94a280b59d0ea6 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/77.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/77.json
@@ -12,5 +12,5 @@
     }
   },
   "m_displayName": "FrenziedFist",
-  "m_availability": 2
+  "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/FloatingCounterCustomEffectDefinition/93.json b/data/json/FloatingCounterCustomEffectDefinition/93.json
index 36f83d41edcd8b9e78adb1fceec61d024caa1dfa..99be33be2fe5cf11d2df40f1a3d35114e3c7c901 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/93.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/93.json
@@ -8,7 +8,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "GainARProtectiveWhisper",
           "baseValue": 12.0,
           "factor": {
diff --git a/data/json/FloatingCounterCustomEffectDefinition/97.json b/data/json/FloatingCounterCustomEffectDefinition/97.json
index 534af69a722f79531a02adab13ee000b78450a94..242eea5a1e585e997ec2ed470e3b32ee88ad235d 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/97.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/97.json
@@ -12,5 +12,5 @@
     }
   },
   "m_displayName": "FrozenBolt",
-  "m_availability": 2
+  "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/FloatingCounterCustomEffectDefinition/98.json b/data/json/FloatingCounterCustomEffectDefinition/98.json
index 4fffa86e6a66cfb156a344a683ade02689048bbf..96e29fec06899d21718e0c00bd70d453d59ba370 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/98.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/98.json
@@ -8,7 +8,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "FatalDmg",
           "baseValue": 14.9,
           "factor": {
diff --git a/data/json/FloatingCounterCustomEffectDefinition/99.json b/data/json/FloatingCounterCustomEffectDefinition/99.json
index 639ef75069db2cddb7ca9b592749b83ffc5dc6ed..00cab0e9d501a2518c0b12d448baf8a668e69b4d 100644
--- a/data/json/FloatingCounterCustomEffectDefinition/99.json
+++ b/data/json/FloatingCounterCustomEffectDefinition/99.json
@@ -9,13 +9,13 @@
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "rain",
-          "value": 25
+          "referenceId": "mireDmg",
+          "value": 11
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "mireDmg",
-          "value": 11
+          "referenceId": "pm",
+          "value": 1
         }
       ],
       "hasEffects": false,
diff --git a/data/json/FloorMechanismDefinition/1203.json b/data/json/FloorMechanismDefinition/1203.json
index df03ecb529f870729fcefedaf5729ec69cfb32c0..d195daf5d550cbb40d8ee8bd9b9db17c4c805d31 100644
--- a/data/json/FloorMechanismDefinition/1203.json
+++ b/data/json/FloorMechanismDefinition/1203.json
@@ -13,21 +13,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 54.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 66.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
diff --git a/data/json/FloorMechanismDefinition/1606.json b/data/json/FloorMechanismDefinition/1606.json
index b6b86b1f4b4a19974dae506052e6456a01b776cc..5d06c2849551724af88cfc6b0ae29ea3b184b9ad 100644
--- a/data/json/FloorMechanismDefinition/1606.json
+++ b/data/json/FloorMechanismDefinition/1606.json
@@ -13,26 +13,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg1",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "FLOOR"
       ]
     },
diff --git a/data/json/FloorMechanismDefinition/278.json b/data/json/FloorMechanismDefinition/278.json
index 40da9ec48f333e722a7084b16b3d871d425bd25b..cc534c83ad63c1c9165ae463fd5e39853eac7f27 100644
--- a/data/json/FloorMechanismDefinition/278.json
+++ b/data/json/FloorMechanismDefinition/278.json
@@ -13,12 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
diff --git a/data/json/FragmentDefinition/101.json b/data/json/FragmentDefinition/101.json
index 2af1077b10f6576f1276498e3534e51bfa74dc3b..6ed5693a0b2ae0f8e5f804785ceca93c029646c6 100644
--- a/data/json/FragmentDefinition/101.json
+++ b/data/json/FragmentDefinition/101.json
@@ -16,7 +16,7 @@
   },
   "m_displayName": "COMMUN - Fragment Émeraude Commun",
   "m_availability": 3,
-  "assetGuid": "6706b3e0f9f785a4ab2f9f6f0c057a55",
+  "assetGuid": "500a2ff130abd234eac02fcf66a49a2a",
   "m_i18nNameId": 10572,
   "m_i18nDescriptionId": 86827
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/152.json b/data/json/FragmentDefinition/152.json
index cce1e4297502f1b976dfa89466bd48b9ec19fc8b..6c576955e30b217fc6defdd34fda5cc43f8d4acd 100644
--- a/data/json/FragmentDefinition/152.json
+++ b/data/json/FragmentDefinition/152.json
@@ -16,7 +16,7 @@
   },
   "m_displayName": "COMMUN - Fragment Améthyste Commun",
   "m_availability": 3,
-  "assetGuid": "8d6bf767e3797a949ad43838a5b831e0",
+  "assetGuid": "500a2ff130abd234eac02fcf66a49a2a",
   "m_i18nNameId": 39832,
   "m_i18nDescriptionId": 47395
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/179.json b/data/json/FragmentDefinition/179.json
index d2405193ace3587593379ed11f8a747d4cc37897..37b1e11f1ed362f82b0c7a23951a29ef361dc39b 100644
--- a/data/json/FragmentDefinition/179.json
+++ b/data/json/FragmentDefinition/179.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 179,
-    "rarity": 1,
+    "rarity": 2,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "RARE - Fragment Améthyste Rare",
   "m_availability": 3,
-  "assetGuid": "503f0eee650c5ee4e8ac732628eec840",
+  "assetGuid": "e585194de289cfd4abf77a081e65d811",
   "m_i18nNameId": 11077,
   "m_i18nDescriptionId": 19494
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/222.json b/data/json/FragmentDefinition/222.json
index 116e03ccd6c39e52ac8b0cfda458558a4d9048c4..29952d441f83477826f119e563772403686f6d51 100644
--- a/data/json/FragmentDefinition/222.json
+++ b/data/json/FragmentDefinition/222.json
@@ -16,7 +16,7 @@
   },
   "m_displayName": "COMMUN - Fragment Rubis Commun",
   "m_availability": 3,
-  "assetGuid": "b3a237ef6c23e4543a5a4a0ce1c03bb8",
+  "assetGuid": "500a2ff130abd234eac02fcf66a49a2a",
   "m_i18nNameId": 17335,
   "m_i18nDescriptionId": 799
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/232.json b/data/json/FragmentDefinition/232.json
index 7419709ed54e35f3a58f127a5e2cb9f2f751a64f..bdc4ce0f579767910fb3e2bbdfd386514efdb020 100644
--- a/data/json/FragmentDefinition/232.json
+++ b/data/json/FragmentDefinition/232.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 232,
-    "rarity": 1,
+    "rarity": 2,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "RARE - Fragment Émeraude Rare",
   "m_availability": 3,
-  "assetGuid": "43a505e978c0aec4a8ae2b9963c308fb",
+  "assetGuid": "e585194de289cfd4abf77a081e65d811",
   "m_i18nNameId": 17068,
   "m_i18nDescriptionId": 93593
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/261.json b/data/json/FragmentDefinition/261.json
index 6214bf2c8ef389f4cfeae93aba2b3c1672bd9903..cf6dc18e151f6bb14886538b60a9d400fefe9dbd 100644
--- a/data/json/FragmentDefinition/261.json
+++ b/data/json/FragmentDefinition/261.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 261,
-    "rarity": 1,
+    "rarity": 2,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "RARE - Fragment Saphir Rare",
   "m_availability": 3,
-  "assetGuid": "d31437501c57161408bf28995c1bf59c",
+  "assetGuid": "e585194de289cfd4abf77a081e65d811",
   "m_i18nNameId": 90034,
   "m_i18nDescriptionId": 89385
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/286.json b/data/json/FragmentDefinition/286.json
index 5532606d0838ea5d5f97885bfaf32ce94c0595a3..1ff4455f17320df964f46b1a800924239d4f074a 100644
--- a/data/json/FragmentDefinition/286.json
+++ b/data/json/FragmentDefinition/286.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 286,
-    "rarity": 1,
+    "rarity": 2,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "RARE - Fragment Rubis Rare",
   "m_availability": 3,
-  "assetGuid": "db2aba0a004bf044aab9fc71bc017e62",
+  "assetGuid": "e585194de289cfd4abf77a081e65d811",
   "m_i18nNameId": 80766,
   "m_i18nDescriptionId": 73091
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/41.json b/data/json/FragmentDefinition/41.json
index a15cf3c2844a5bd40867004b6451b93d87a101c4..f2fe59b5d099942ae8c2680be678e03a1a3dace6 100644
--- a/data/json/FragmentDefinition/41.json
+++ b/data/json/FragmentDefinition/41.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 41,
-    "rarity": 2,
+    "rarity": 4,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "LÉGENDAIRE - Fragment Améthyste Légendaire",
   "m_availability": 3,
-  "assetGuid": "76a9952d61e7ced41b540eac5151218a",
+  "assetGuid": "263f376e79e65a04db82fd6ac79f75bc",
   "m_i18nNameId": 86366,
   "m_i18nDescriptionId": 18475
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/419.json b/data/json/FragmentDefinition/419.json
index 40866dde1f00e66c7ccbbe8f79a9a635bbb0aa96..33afa6808a072bd0c788a7fcfa96aef5a506230d 100644
--- a/data/json/FragmentDefinition/419.json
+++ b/data/json/FragmentDefinition/419.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 419,
-    "rarity": 2,
+    "rarity": 4,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "LÉGENDAIRE - Fragment Topaze Légendaire",
   "m_availability": 3,
-  "assetGuid": "aa22ce0ceb16be9418f83962a1c0bbb7",
+  "assetGuid": "263f376e79e65a04db82fd6ac79f75bc",
   "m_i18nNameId": 52602,
   "m_i18nDescriptionId": 89620
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/532.json b/data/json/FragmentDefinition/532.json
index 3f6a64d0c4e3d1c98f5e71282d6dc42c4d506b6d..e4c92af1cabe68d2c9aecf68db3c762088de7dd8 100644
--- a/data/json/FragmentDefinition/532.json
+++ b/data/json/FragmentDefinition/532.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 532,
-    "rarity": 2,
+    "rarity": 4,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "LÉGENDAIRE - Fragment Émeraude Légendaire",
   "m_availability": 3,
-  "assetGuid": "23a62dd853e2b09499d7c9fe7f841554",
+  "assetGuid": "263f376e79e65a04db82fd6ac79f75bc",
   "m_i18nNameId": 11776,
   "m_i18nDescriptionId": 92448
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/675.json b/data/json/FragmentDefinition/675.json
index 48dc3b54ddb0191a9fbd4134f1199d5555cf0c72..c25a4bdfa1ce19ccaa1e11080fe54a93ceda927a 100644
--- a/data/json/FragmentDefinition/675.json
+++ b/data/json/FragmentDefinition/675.json
@@ -16,7 +16,7 @@
   },
   "m_displayName": "COMMUN - Fragment Saphir Commun",
   "m_availability": 3,
-  "assetGuid": "57982299a0770614c87847444a7eff61",
+  "assetGuid": "500a2ff130abd234eac02fcf66a49a2a",
   "m_i18nNameId": 56880,
-  "m_i18nDescriptionId": 73091
-}
+  "m_i18nDescriptionId": 68703
+}
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/708.json b/data/json/FragmentDefinition/708.json
index 49191eac9732452bc31ecf6c8ae40582ddcbd72f..3bcb43de55d5e03807cf1d36d182e17aada631b1 100644
--- a/data/json/FragmentDefinition/708.json
+++ b/data/json/FragmentDefinition/708.json
@@ -16,7 +16,7 @@
   },
   "m_displayName": "COMMUN - Fragment Topaze Commun",
   "m_availability": 3,
-  "assetGuid": "4dbe762d2ceb2cf41836fe7b88211077",
+  "assetGuid": "500a2ff130abd234eac02fcf66a49a2a",
   "m_i18nNameId": 70565,
   "m_i18nDescriptionId": 82562
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/728.json b/data/json/FragmentDefinition/728.json
index e1425b822537b20ec17b3d901f887d625189e39d..1908c2f96613d0abb5085066d721f30bde0e6fbe 100644
--- a/data/json/FragmentDefinition/728.json
+++ b/data/json/FragmentDefinition/728.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 728,
-    "rarity": 2,
+    "rarity": 4,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "LÉGENDAIRE - Fragment Rubis Légendaire",
   "m_availability": 3,
-  "assetGuid": "d2952a5ca6baf9f46ae4b7856640310f",
+  "assetGuid": "263f376e79e65a04db82fd6ac79f75bc",
   "m_i18nNameId": 91667,
   "m_i18nDescriptionId": 24262
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/742.json b/data/json/FragmentDefinition/742.json
index a43e7b47437633cdc770b0859f40be1b57780919..6549e8bd157c95c05467bf029351699168e7d20e 100644
--- a/data/json/FragmentDefinition/742.json
+++ b/data/json/FragmentDefinition/742.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 742,
-    "rarity": 1,
+    "rarity": 2,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "RARE - Fragment Topaze Rare",
   "m_availability": 3,
-  "assetGuid": "5d46a103de3e9864aa70baaed866d878",
+  "assetGuid": "e585194de289cfd4abf77a081e65d811",
   "m_i18nNameId": 55104,
   "m_i18nDescriptionId": 22140
 }
\ No newline at end of file
diff --git a/data/json/FragmentDefinition/873.json b/data/json/FragmentDefinition/873.json
index befca2a783295d1b974ef727f2351fe79b7b20aa..3020be846c931b4b4f6def21c58187803af5d5f9 100644
--- a/data/json/FragmentDefinition/873.json
+++ b/data/json/FragmentDefinition/873.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "FragmentDefinition",
     "id": 873,
-    "rarity": 2,
+    "rarity": 4,
     "merchantCosts": [
       {
         "type": "CurrencyCost",
@@ -16,7 +16,7 @@
   },
   "m_displayName": "LÉGENDAIRE - Fragment Saphir Légendaire",
   "m_availability": 3,
-  "assetGuid": "0b89618b37210d043b46ecf0f02a04de",
+  "assetGuid": "263f376e79e65a04db82fd6ac79f75bc",
   "m_i18nNameId": 1514,
   "m_i18nDescriptionId": 18262
 }
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/109.json b/data/json/GemEquipmentDefinition/109.json
deleted file mode 100644
index ff78b461db854264152e7c76b853fcd471c3c0f4..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/109.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "109",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 109,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "PETRIFY",
-        {
-          "type": 25,
-          "id": 690
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      690
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - TERRE - Fossilisation",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 79129,
-  "m_i18nDescriptionId": 95327
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/114.json b/data/json/GemEquipmentDefinition/114.json
deleted file mode 100644
index 3c0ef20a259823d82e85ef896fad856edcaf3194..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/114.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "114",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 114,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 334
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      334
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - AIR - Flux",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 51829,
-  "m_i18nDescriptionId": 79758
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/12.json b/data/json/GemEquipmentDefinition/12.json
deleted file mode 100644
index 50bcc027c9b2f6b8a307bb13bdc670ff30b77251..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/12.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "12",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 12,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      273
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Sibylle Nécromique",
-  "m_availability": 3,
-  "assetGuid": "02d75f512a1e84044aeca27f7a8851f8",
-  "m_i18nNameId": 90465,
-  "m_i18nDescriptionId": 88289
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/127.json b/data/json/GemEquipmentDefinition/127.json
deleted file mode 100644
index b320145a5f71f6e16a559238aecd96a661a5a644..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/127.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "127",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 127,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      74
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Feu Mollet",
-  "m_availability": 3,
-  "assetGuid": "f2f55338e146c3640bd77775326e6e69",
-  "m_i18nNameId": 81508,
-  "m_i18nDescriptionId": 47941
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/131.json b/data/json/GemEquipmentDefinition/131.json
deleted file mode 100644
index 9676733a8a095c1faf2c338f2abef4028d7916af..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/131.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "131",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 131,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      645
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Orbe Mugissant",
-  "m_availability": 3,
-  "assetGuid": "78667def26e531d48ac44427693483a9",
-  "m_i18nNameId": 79211,
-  "m_i18nDescriptionId": 8746
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/132.json b/data/json/GemEquipmentDefinition/132.json
deleted file mode 100644
index 87b9e92d6e76028ce36048b709feb5452409a517..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/132.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "132",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 132,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 62935
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      62935
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - TERRE - Charge Butoir",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 75997,
-  "m_i18nDescriptionId": 33280
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/133.json b/data/json/GemEquipmentDefinition/133.json
deleted file mode 100644
index 112b2acc867ddbc1a394c1add5ce10c8e7086304..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/133.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "133",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 133,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      276
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Toufeutouflamme",
-  "m_availability": 3,
-  "assetGuid": "0fb724953f172474f87a71b8c8049f5f",
-  "m_i18nNameId": 64207,
-  "m_i18nDescriptionId": 1207
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/137.json b/data/json/GemEquipmentDefinition/137.json
deleted file mode 100644
index af1cbd023fb4afc43cbc25fc4d1062336123ea44..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/137.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "137",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 137,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      67393
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Jaspe Calcifié",
-  "m_availability": 3,
-  "assetGuid": "bdf96c78d03abdc42b80032e3a74068a",
-  "m_i18nNameId": 22837,
-  "m_i18nDescriptionId": 35143
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/145.json b/data/json/GemEquipmentDefinition/145.json
deleted file mode 100644
index becb229d0e4dde316e1e8b96f585905ef940179b..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/145.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "145",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 145,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      69119
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Bulle Calmante",
-  "m_availability": 3,
-  "assetGuid": "125f652ea3248c945968c16d82a53500",
-  "m_i18nNameId": 44707,
-  "m_i18nDescriptionId": 60234
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/146.json b/data/json/GemEquipmentDefinition/146.json
deleted file mode 100644
index 2f389dd49fb7b05c20a5c5a3d903b0d54896e9d9..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/146.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "146",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 146,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      440
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Volovent",
-  "m_availability": 3,
-  "assetGuid": "f27b8a4215048f44ebd6a8d167bb6baa",
-  "m_i18nNameId": 33843,
-  "m_i18nDescriptionId": 70963
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/15.json b/data/json/GemEquipmentDefinition/15.json
deleted file mode 100644
index 059dca679ffde8a937adeb7368b7256c266014b0..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/15.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 15,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      406
-    ]
-  },
-  "m_displayName": "COMMUN - AIR - Ogomatta Chasseur",
-  "m_availability": 3,
-  "assetGuid": "fc211d06f1b516047ae5fd500eccaf1d",
-  "m_i18nNameId": 13792,
-  "m_i18nDescriptionId": 21618
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/159.json b/data/json/GemEquipmentDefinition/159.json
deleted file mode 100644
index 9a04243e77a9402762d00ba68d0a021fb0431701..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/159.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "159",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 159,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      66688
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Ayamali Draconique",
-  "m_availability": 3,
-  "assetGuid": "43892b11233d20b4bbb5acb62ba7b03b",
-  "m_i18nNameId": 68146,
-  "m_i18nDescriptionId": 81102
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/180.json b/data/json/GemEquipmentDefinition/180.json
deleted file mode 100644
index 50394eb5e699f39310bb7c9cb914a4d0390c5f0a..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/180.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "180",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 180,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      128
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Terragano",
-  "m_availability": 3,
-  "assetGuid": "1c6389d3b7902a74285326e5abf6a5e3",
-  "m_i18nNameId": 90734,
-  "m_i18nDescriptionId": 24280
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/190.json b/data/json/GemEquipmentDefinition/190.json
deleted file mode 100644
index 6f2c4559079487661516eb46f63a2130b946e4ea..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/190.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "190",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 190,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 790
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      790
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - FEU - Ardeur",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 6603,
-  "m_i18nDescriptionId": 93555
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/191.json b/data/json/GemEquipmentDefinition/191.json
deleted file mode 100644
index 840b8247fd387210e47c0507cb7f78200ec69de6..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/191.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "191",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 191,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      362
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Perle Enmeyer",
-  "m_availability": 3,
-  "assetGuid": "aa47ead3a8effb84b9702d98261191fb",
-  "m_i18nNameId": 139136,
-  "m_i18nDescriptionId": 50686
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/195.json b/data/json/GemEquipmentDefinition/195.json
deleted file mode 100644
index 1d59a5d3a2a5bfa2b4b4c42ee8817d3d18d461a2..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/195.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "195",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 195,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      68622
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Brise Crâne",
-  "m_availability": 3,
-  "assetGuid": "9c44c3cfe25cd8047b1b9c160dc027a8",
-  "m_i18nNameId": 69624,
-  "m_i18nDescriptionId": 98031
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/196.json b/data/json/GemEquipmentDefinition/196.json
deleted file mode 100644
index 73f0ddb29a3bfbf4868c8c8a2391f2b05d28b447..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/196.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "196",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 196,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 672
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      672
-    ]
-  },
-  "m_displayName": "NOT USED - LÉGENDAIRE - NEUTRE - Requiem",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 7245,
-  "m_i18nDescriptionId": 62428
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/200.json b/data/json/GemEquipmentDefinition/200.json
deleted file mode 100644
index f2a12fa3f6c1a78378a8d97f7e6c66e63235f752..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/200.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "200",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 200,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 68
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      68
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - NEUTRE - Luminescence",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 55208,
-  "m_i18nDescriptionId": 30648
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/202.json b/data/json/GemEquipmentDefinition/202.json
deleted file mode 100644
index b4b820a48228598a15d0c15be5e41e3ff410c697..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/202.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "202",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 202,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 64908
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      64908
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - TERRE - Moisson",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 44460,
-  "m_i18nDescriptionId": 7397
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/208.json b/data/json/GemEquipmentDefinition/208.json
deleted file mode 100644
index 0a3f3cb5542104b55a6a1b6f6880be55e1bd69a8..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/208.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "208",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 208,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 420
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      420
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - AIR - Catapultage",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 74699,
-  "m_i18nDescriptionId": 44839
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/22.json b/data/json/GemEquipmentDefinition/22.json
deleted file mode 100644
index f19756a2b3e06cf0081e5b45f6594a1f76df31f6..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/22.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "22",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 22,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      65910
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Gon Draconique",
-  "m_availability": 3,
-  "assetGuid": "bfd7871d38be98e47b5ae7f6c382cdb3",
-  "m_i18nNameId": 89747,
-  "m_i18nDescriptionId": 61696
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/232.json b/data/json/GemEquipmentDefinition/232.json
deleted file mode 100644
index ae638179d50b2548c6724e73dc50b7e619029827..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/232.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "232",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 232,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      578
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Mandatrice Nécromique",
-  "m_availability": 3,
-  "assetGuid": "e2c4bdb59857808478be02e3b43e992f",
-  "m_i18nNameId": 76667,
-  "m_i18nDescriptionId": 21291
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/243.json b/data/json/GemEquipmentDefinition/243.json
deleted file mode 100644
index 627d744ebcac36d5dfe710f7edd7c4a96802a7b4..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/243.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "243",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 243,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 61647
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      61647
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - NEUTRE - Intempérie",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 25127,
-  "m_i18nDescriptionId": 23801
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/248.json b/data/json/GemEquipmentDefinition/248.json
deleted file mode 100644
index b82eeb74c61eadcf1b44f99eb4210ff798da00d2..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/248.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "248",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 248,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      657
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Graine Draconique",
-  "m_availability": 3,
-  "assetGuid": "aceeacacf3fdcc542a7305caaf4381b4",
-  "m_i18nNameId": 80409,
-  "m_i18nDescriptionId": 70599
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/253.json b/data/json/GemEquipmentDefinition/253.json
deleted file mode 100644
index 7b9d871f961f7806a64292ee4d40e2ee5dfaeed2..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/253.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "253",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 253,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      68278
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Graine Terrassante",
-  "m_availability": 3,
-  "assetGuid": "2be32fe05e38a99469d1174ec6579f15",
-  "m_i18nNameId": 54247,
-  "m_i18nDescriptionId": 484
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/282.json b/data/json/GemEquipmentDefinition/282.json
deleted file mode 100644
index 39d260167622f91add798edc834734e70f5be6df..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/282.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "282",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 282,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      418
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Drouragan Draconique",
-  "m_availability": 3,
-  "assetGuid": "1a259817fc03c3849abdab2abd5856db",
-  "m_i18nNameId": 70412,
-  "m_i18nDescriptionId": 99188
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/294.json b/data/json/GemEquipmentDefinition/294.json
deleted file mode 100644
index 31c3b74073cc8eeaff7f3796d460284ff1a90627..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/294.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "294",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 294,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 510
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      510
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - FEU - Embrasement",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 71060,
-  "m_i18nDescriptionId": 54469
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/296.json b/data/json/GemEquipmentDefinition/296.json
deleted file mode 100644
index a39737e2e1535a024a5253570b6057e6aceb0180..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/296.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "296",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 296,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "AROUND",
-        "UNTARGETABLE",
-        {
-          "type": 25,
-          "id": 64308
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      64308
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - EAU - Fumigène",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 16307,
-  "m_i18nDescriptionId": 29096
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/302.json b/data/json/GemEquipmentDefinition/302.json
deleted file mode 100644
index 448b14195d40716cd409468b059e14ed4a6bdc75..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/302.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "302",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 302,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 763
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      763
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - FEU - Magnat",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 77350,
-  "m_i18nDescriptionId": 21605
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/324.json b/data/json/GemEquipmentDefinition/324.json
deleted file mode 100644
index f987ffe42e6d18eb621fbd070ecdfa6b9aa19931..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/324.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "324",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 324,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      312
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Fumeron Nécromique",
-  "m_availability": 3,
-  "assetGuid": "09e4e15c449c6c342a29b768bf9f8468",
-  "m_i18nNameId": 44780,
-  "m_i18nDescriptionId": 28219
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/328.json b/data/json/GemEquipmentDefinition/328.json
deleted file mode 100644
index e12720f1cec9646a1e16bd88c497d1aab13a4855..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/328.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "328",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 328,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      61533
-    ]
-  },
-  "m_displayName": "COMMUN - AIR - Quartaclysme",
-  "m_availability": 3,
-  "assetGuid": "e78634763bf77164a929e785910dab11",
-  "m_i18nNameId": 38756,
-  "m_i18nDescriptionId": 18195
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/337.json b/data/json/GemEquipmentDefinition/337.json
deleted file mode 100644
index 12e5b5cd15a709134d45c4917a3dbd419296f281..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/337.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "337",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 337,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      782
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Exsudante Nécromique",
-  "m_availability": 3,
-  "assetGuid": "4b299dbfce4c71b46b116ecc6bc507a7",
-  "m_i18nNameId": 83833,
-  "m_i18nDescriptionId": 40155
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/340.json b/data/json/GemEquipmentDefinition/340.json
deleted file mode 100644
index 036f3ae4e15e7d852c578a954d11878e9c7b6db7..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/340.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "340",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 340,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "AURA",
-        {
-          "type": 25,
-          "id": 668
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      668
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - NEUTRE - Éclatement",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 13606,
-  "m_i18nDescriptionId": 90786
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/343.json b/data/json/GemEquipmentDefinition/343.json
deleted file mode 100644
index 7a22fedca6f5b2990f350f294453d3b6d5cd0fb5..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/343.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "343",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 343,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      68796
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Roc Ibalboa",
-  "m_availability": 3,
-  "assetGuid": "8742cd86e8b065e4c90506c0b400d19d",
-  "m_i18nNameId": 35127,
-  "m_i18nDescriptionId": 21265
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/347.json b/data/json/GemEquipmentDefinition/347.json
deleted file mode 100644
index 580c384b4e195a983369710f94e396340908ae17..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/347.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "347",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 347,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "ROOTED",
-        {
-          "type": 25,
-          "id": 637
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      637
-    ]
-  },
-  "m_displayName": "NOT USED - LÉGENDAIRE - TERRE - Traque",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 37390,
-  "m_i18nDescriptionId": 30063
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/35.json b/data/json/GemEquipmentDefinition/35.json
deleted file mode 100644
index 58bd581b7f5deb83eae518886d653f3e27df0b6c..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/35.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "35",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 35,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      176
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Creuztombe",
-  "m_availability": 3,
-  "assetGuid": "ad7d8c26d7438fb4faf0be8039e4e338",
-  "m_i18nNameId": 22069,
-  "m_i18nDescriptionId": 47604
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/357.json b/data/json/GemEquipmentDefinition/357.json
deleted file mode 100644
index d2cb95b21916443c423b734ba83ed1d828969b93..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/357.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "357",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 357,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      590
-    ]
-  },
-  "m_displayName": "COMMUN - TERRE - Ogomatta Protecteur",
-  "m_availability": 3,
-  "assetGuid": "7941c0acbacd4f54e9bed434ca5eb19a",
-  "m_i18nNameId": 55349,
-  "m_i18nDescriptionId": 70984
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/361.json b/data/json/GemEquipmentDefinition/361.json
deleted file mode 100644
index 545776cfedc04eebc95c8e48d9045412af6d23d9..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/361.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "361",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 361,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      812
-    ]
-  },
-  "m_displayName": "COMMUN - TERRE - Bubon d\u0027Argile",
-  "m_availability": 3,
-  "assetGuid": "dd4176c2409eb394e87c828d013a1dfb",
-  "m_i18nNameId": 70267,
-  "m_i18nDescriptionId": 35853
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/371.json b/data/json/GemEquipmentDefinition/371.json
deleted file mode 100644
index f05f4d3446e5e4c1fa4db1f0c52b5bb56c88b468..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/371.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "371",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 371,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      69663
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Expirante Nécromique",
-  "m_availability": 3,
-  "assetGuid": "c2bffb27dbeb90848a902b48817a5dea",
-  "m_i18nNameId": 3759,
-  "m_i18nDescriptionId": 48901
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/382.json b/data/json/GemEquipmentDefinition/382.json
deleted file mode 100644
index f51faa7cf95e7258fa95c57dad1cccf548beca1b..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/382.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "382",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 382,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      504
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Coeur de la Mer",
-  "m_availability": 3,
-  "assetGuid": "355b4c04cc5b60b4aacaf215d43a8d30",
-  "m_i18nNameId": 5939,
-  "m_i18nDescriptionId": 84101
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/387.json b/data/json/GemEquipmentDefinition/387.json
deleted file mode 100644
index f5f01fedfa31181f2cbc5ec39fef2600fc299bbf..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/387.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "387",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 387,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      70738
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Fournaise Nécromique",
-  "m_availability": 3,
-  "assetGuid": "dee7035f49e2344499f9729c3a593149",
-  "m_i18nNameId": 41045,
-  "m_i18nDescriptionId": 94222
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/404.json b/data/json/GemEquipmentDefinition/404.json
deleted file mode 100644
index ce7b6a25cca8c644b034219778c76eed258c4f14..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/404.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "404",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 404,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      493
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Karakéole",
-  "m_availability": 3,
-  "assetGuid": "5aa239cc52b597442a1de3d27bb56e51",
-  "m_i18nNameId": 41927,
-  "m_i18nDescriptionId": 66372
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/405.json b/data/json/GemEquipmentDefinition/405.json
deleted file mode 100644
index e630154f6de5ca9d58848ae3ac0864f55137a2e2..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/405.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "405",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 405,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      256
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Goutte Animée",
-  "m_availability": 3,
-  "assetGuid": "01d61166342c8494890269f40158ca42",
-  "m_i18nNameId": 91385,
-  "m_i18nDescriptionId": 30915
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/411.json b/data/json/GemEquipmentDefinition/411.json
deleted file mode 100644
index ac172e6d5c21ccfda8c641cd7469649c148ad4c7..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/411.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "411",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 411,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      434
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Gravillon Draconique",
-  "m_availability": 3,
-  "assetGuid": "300ee4ed92433874ea809b2a266ebaea",
-  "m_i18nNameId": 78560,
-  "m_i18nDescriptionId": 66854
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/415.json b/data/json/GemEquipmentDefinition/415.json
deleted file mode 100644
index d6cf3c6bd9188a92aacc1e5693e718efa67708d4..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/415.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "415",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 415,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 62257
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      62257
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - EAU - Entraînement",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 10567,
-  "m_i18nDescriptionId": 96323
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/425.json b/data/json/GemEquipmentDefinition/425.json
deleted file mode 100644
index 3cb311c89688188d4029c43db945c0d911a56f7b..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/425.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "425",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 425,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      68052
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Scorie Ardente",
-  "m_availability": 3,
-  "assetGuid": "bfce208a267d48745923604c024101d0",
-  "m_i18nNameId": 64042,
-  "m_i18nDescriptionId": 91212
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/434.json b/data/json/GemEquipmentDefinition/434.json
deleted file mode 100644
index 205ddb7e9c8556c1171469a6e467674c3d889786..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/434.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "434",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 434,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      66687
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Incandescente Draconique",
-  "m_availability": 3,
-  "assetGuid": "03ce80a3890e672489762f13146fa2d9",
-  "m_i18nNameId": 58468,
-  "m_i18nDescriptionId": 58336
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/44.json b/data/json/GemEquipmentDefinition/44.json
deleted file mode 100644
index b4a3a368bf563433963b08122d73acceec66c3d8..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/44.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "44",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 44,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 707
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      707
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - AIR - Lecture du Vent",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 56776,
-  "m_i18nDescriptionId": 88025
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/440.json b/data/json/GemEquipmentDefinition/440.json
deleted file mode 100644
index 52510feac8e3b583df7928ab855ee1ab28806790..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/440.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "440",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 440,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      491
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Foudroyeur",
-  "m_availability": 3,
-  "assetGuid": "5350b95a839d1d14fb414351a4c50301",
-  "m_i18nNameId": 68271,
-  "m_i18nDescriptionId": 87248
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/446.json b/data/json/GemEquipmentDefinition/446.json
deleted file mode 100644
index 87a79a07a0dcb50a85f26807f291ade6e0db70e0..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/446.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "446",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 446,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 847
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      847
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - NEUTRE - Ruée",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 24877,
-  "m_i18nDescriptionId": 32059
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/451.json b/data/json/GemEquipmentDefinition/451.json
deleted file mode 100644
index e34aea6749955598dd611eca99bbc136f10c6fad..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/451.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "451",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 451,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      66464
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Brise Draconique",
-  "m_availability": 3,
-  "assetGuid": "7c96d669d4fdeef4190acf3df09e5fb0",
-  "m_i18nNameId": 23226,
-  "m_i18nDescriptionId": 33204
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/452.json b/data/json/GemEquipmentDefinition/452.json
deleted file mode 100644
index d0b808857b7e15508121200a8bebc45d7bb03b51..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/452.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "452",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 452,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      528
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Roc Draconique",
-  "m_availability": 3,
-  "assetGuid": "963f97360bebaef4dae70cb860330e60",
-  "m_i18nNameId": 73921,
-  "m_i18nDescriptionId": 82557
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/49.json b/data/json/GemEquipmentDefinition/49.json
deleted file mode 100644
index 54cb99680ef28470dc20f70b2627c7c931fe4211..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/49.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "49",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 49,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      322
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Uricane Draconique",
-  "m_availability": 3,
-  "assetGuid": "1f11dc9d2cf9f2748bf3bd57bc595ebc",
-  "m_i18nNameId": 28080,
-  "m_i18nDescriptionId": 79092
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/491.json b/data/json/GemEquipmentDefinition/491.json
deleted file mode 100644
index 7c448c96249c2b495de9aae67b43007bd753b746..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/491.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "491",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 491,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "REVENGE",
-        {
-          "type": 25,
-          "id": 744
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      744
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - NEUTRE - Rancune",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 24164,
-  "m_i18nDescriptionId": 82377
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/496.json b/data/json/GemEquipmentDefinition/496.json
deleted file mode 100644
index 0cfdb3b7eac3c8209a9cf0bd74e6641e67186117..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/496.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "496",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 496,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "FROZEN",
-        {
-          "type": 25,
-          "id": 851
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      851
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - EAU - Glaçon",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 64836,
-  "m_i18nDescriptionId": 25686
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/5.json b/data/json/GemEquipmentDefinition/5.json
deleted file mode 100644
index 7197e8df70dd4d212492779108283f46cc1c7ece..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/5.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "5",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 5,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      748
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Roche Chagrine",
-  "m_availability": 3,
-  "assetGuid": "a82094c36c542ab4a8fe8bd2df8851ae",
-  "m_i18nNameId": 89421,
-  "m_i18nDescriptionId": 86033
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/504.json b/data/json/GemEquipmentDefinition/504.json
deleted file mode 100644
index 90eb67e004b89a785e2ac6c25ed393e1a8fc7ba0..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/504.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "504",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 504,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 177
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      177
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - NEUTRE - Aurore",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 7301,
-  "m_i18nDescriptionId": 12311
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/511.json b/data/json/GemEquipmentDefinition/511.json
deleted file mode 100644
index b36ef6bb4603769b99024db599a048c5282326d9..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/511.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "511",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 511,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      70760
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Reviviscence Nécromique",
-  "m_availability": 3,
-  "assetGuid": "8f8c0abf911062347a0d2b34c12b9ac9",
-  "m_i18nNameId": 83309,
-  "m_i18nDescriptionId": 82633
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/524.json b/data/json/GemEquipmentDefinition/524.json
deleted file mode 100644
index 225caa6dba765704f096894d731b54907999fae0..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/524.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "524",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 524,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      61009
-    ]
-  },
-  "m_displayName": "COMMUN - EAU - Crachin",
-  "m_availability": 3,
-  "assetGuid": "4f29432d1b028fe4bb693adc2c72d1a1",
-  "m_i18nNameId": 20831,
-  "m_i18nDescriptionId": 55751
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/53.json b/data/json/GemEquipmentDefinition/53.json
deleted file mode 100644
index c09b0ad4a6b43f4ff393ff44798fe175f28ea160..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/53.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "53",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 53,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      559
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Agglomerat Nécromique",
-  "m_availability": 3,
-  "assetGuid": "75868933f9f1f784385faebf1ff37b1e",
-  "m_i18nNameId": 89148,
-  "m_i18nDescriptionId": 38090
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/532.json b/data/json/GemEquipmentDefinition/532.json
deleted file mode 100644
index f8ee14566f7c6dd2c778ab65ecbde77bbe621885..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/532.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "532",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 532,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "PETRIFY",
-        {
-          "type": 25,
-          "id": 721
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      721
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - TERRE - Ciment",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 47978,
-  "m_i18nDescriptionId": 32444
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/545.json b/data/json/GemEquipmentDefinition/545.json
deleted file mode 100644
index c8d497519ac030503ca9add53898679adef5246e..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/545.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "545",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 545,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      762
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Vortex Déchaîné",
-  "m_availability": 3,
-  "assetGuid": "b22550cdaa6ffdb4481b128bfefb715a",
-  "m_i18nNameId": 24924,
-  "m_i18nDescriptionId": 5913
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/547.json b/data/json/GemEquipmentDefinition/547.json
deleted file mode 100644
index cf0f647fd3a6db8f5b98852e7c83233b4a4c289c..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/547.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "547",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 547,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      37
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Agathe Draconique",
-  "m_availability": 3,
-  "assetGuid": "83048780d19e8fb409d7419fb8ab889b",
-  "m_i18nNameId": 16275,
-  "m_i18nDescriptionId": 25250
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/549.json b/data/json/GemEquipmentDefinition/549.json
deleted file mode 100644
index ac2ea93b2f67b2cdf26dcd5073ab44dc97b07fd3..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/549.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "549",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 549,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "REVENGE",
-        {
-          "type": 25,
-          "id": 63717
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      63717
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - AIR - Courroux",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 19033,
-  "m_i18nDescriptionId": 75870
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/554.json b/data/json/GemEquipmentDefinition/554.json
deleted file mode 100644
index 29e586f02b814bac1d994224576c98fa15e1f168..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/554.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "554",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 554,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 305
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      305
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - NEUTRE - Météore",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 39328,
-  "m_i18nDescriptionId": 40168
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/558.json b/data/json/GemEquipmentDefinition/558.json
deleted file mode 100644
index 9a38c63b1022a5200c09431567826966d1a3df49..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/558.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "558",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 558,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "DEATHBLOW",
-        {
-          "type": 25,
-          "id": 937
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      937
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - EAU - Goutte du Kraken",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 82576,
-  "m_i18nDescriptionId": 18479
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/578.json b/data/json/GemEquipmentDefinition/578.json
deleted file mode 100644
index 35ceef6835a64813473b53daaba22017068e75fc..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/578.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "578",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 578,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      70245
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Pyrobraise Nécromique",
-  "m_availability": 3,
-  "assetGuid": "f233d532684214b4eb44656682a276c1",
-  "m_i18nNameId": 71493,
-  "m_i18nDescriptionId": 73081
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/580.json b/data/json/GemEquipmentDefinition/580.json
deleted file mode 100644
index 7771f02114f30f5328a764b3b43eca03177dec2b..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/580.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "580",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 580,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      898
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Perle Mikui",
-  "m_availability": 3,
-  "assetGuid": "adc524182c8e86e4889d6688a13d64a2",
-  "m_i18nNameId": 58008,
-  "m_i18nDescriptionId": 9325
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/596.json b/data/json/GemEquipmentDefinition/596.json
deleted file mode 100644
index c9a2af47e2ee59ce99876a67e28a20f01e821f17..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/596.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "596",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 596,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 333
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      333
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - NEUTRE - Bagatelle",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 82173,
-  "m_i18nDescriptionId": 47475
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/597.json b/data/json/GemEquipmentDefinition/597.json
deleted file mode 100644
index b93cb6ba362a42452d71198ca7c45c2c540f650e..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/597.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "597",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 597,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      243
-    ]
-  },
-  "m_displayName": "COMMUN - FEU - Ogomatta Violent",
-  "m_availability": 3,
-  "assetGuid": "77171e8e62676014c91a629a293e00e8",
-  "m_i18nNameId": 89192,
-  "m_i18nDescriptionId": 85949
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/601.json b/data/json/GemEquipmentDefinition/601.json
deleted file mode 100644
index df51a1750058d7b1ca7adb28226ba77cdb68c390..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/601.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "601",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 601,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      70744
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Ablution Nécromique",
-  "m_availability": 3,
-  "assetGuid": "75686e85efdf87740b8ad0974ead6297",
-  "m_i18nNameId": 85117,
-  "m_i18nDescriptionId": 34720
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/611.json b/data/json/GemEquipmentDefinition/611.json
deleted file mode 100644
index f96bdcbef801e17f3df39e002bcea532df6222bc..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/611.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "611",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 611,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      216
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Essouffleur Nécromique",
-  "m_availability": 3,
-  "assetGuid": "0853106057ad4e94ab91b4f38bf49b4e",
-  "m_i18nNameId": 72491,
-  "m_i18nDescriptionId": 25943
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/649.json b/data/json/GemEquipmentDefinition/649.json
deleted file mode 100644
index 9b9c99646a636c5b0c82ef3172fe37bdcc70ec28..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/649.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "649",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 649,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 962
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      962
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - EAU - Entassement",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 75642,
-  "m_i18nDescriptionId": 68813
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/658.json b/data/json/GemEquipmentDefinition/658.json
deleted file mode 100644
index 202035d7e06933360c05fffb0b57abc5f4a409e5..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/658.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "658",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 658,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "EXPLOSION",
-        {
-          "type": 25,
-          "id": 64779
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      64779
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - FEU - Traînée de Poudre",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 7861,
-  "m_i18nDescriptionId": 7175
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/684.json b/data/json/GemEquipmentDefinition/684.json
deleted file mode 100644
index bc3b812346397b28cc5d76ae9f904473429eb7d9..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/684.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "684",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 684,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 61201
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      61201
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - AIR - Forage",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 12376,
-  "m_i18nDescriptionId": 28516
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/69.json b/data/json/GemEquipmentDefinition/69.json
deleted file mode 100644
index f41a15354bf58125ed9f8402ac19ea78f8137f9b..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/69.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "69",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 69,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      579
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Eclat Akilon ",
-  "m_availability": 3,
-  "assetGuid": "05ea6eabca1d47c42bf333e8ba0938b4",
-  "m_i18nNameId": 79261,
-  "m_i18nDescriptionId": 6274
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/698.json b/data/json/GemEquipmentDefinition/698.json
deleted file mode 100644
index c7a94688a5ad60584ce2ec3c1d1ae96f62211877..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/698.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "698",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 698,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      60215
-    ]
-  },
-  "m_displayName": "COMMUN - FEU - Helianthe Lascive",
-  "m_availability": 3,
-  "assetGuid": "c8b576b261b23584f8e8d133953285c2",
-  "m_i18nNameId": 87557,
-  "m_i18nDescriptionId": 46024
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/699.json b/data/json/GemEquipmentDefinition/699.json
deleted file mode 100644
index 201536d421cd1d8d073dcfcb488dc3c38e039277..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/699.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "699",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 699,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 60406
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      60406
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - EAU - Assaut Groupé",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 22860,
-  "m_i18nDescriptionId": 20972
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/712.json b/data/json/GemEquipmentDefinition/712.json
deleted file mode 100644
index 5d612bd3d6777d07b940fcde6d7585a7849ff057..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/712.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "712",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 712,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 786
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      786
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - FEU - Cri de Guerre",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 28131,
-  "m_i18nDescriptionId": 78073
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/713.json b/data/json/GemEquipmentDefinition/713.json
deleted file mode 100644
index ca711927882725af778126627ecaada23d79a934..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/713.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "713",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 713,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      972
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Zenkero Draconique",
-  "m_availability": 3,
-  "assetGuid": "58f792e7f2aa14944a0b5b0b7480e135",
-  "m_i18nNameId": 40660,
-  "m_i18nDescriptionId": 59332
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/714.json b/data/json/GemEquipmentDefinition/714.json
deleted file mode 100644
index 5ea9a4debf8a11c6cd08c9ca43466b6a3e74d858..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/714.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "714",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 714,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 64522
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      64522
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - FEU - Retour de Flamme",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 45549,
-  "m_i18nDescriptionId": 85420
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/734.json b/data/json/GemEquipmentDefinition/734.json
deleted file mode 100644
index 2004b18d45c5d56c1c851d5ef3d3eedcdc148ed7..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/734.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "734",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 734,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      69602
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Gelâme",
-  "m_availability": 3,
-  "assetGuid": "cd56f974851b5d342ba5c9ff2d5b2a60",
-  "m_i18nNameId": 87989,
-  "m_i18nDescriptionId": 45083
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/760.json b/data/json/GemEquipmentDefinition/760.json
deleted file mode 100644
index fb039c6dd1081bcf87aed18d2ac11ff54abf124b..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/760.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "760",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 760,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      66833
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Essence Draconique",
-  "m_availability": 3,
-  "assetGuid": "455a04bef6bf02145876195a2c1e586e",
-  "m_i18nNameId": 34580,
-  "m_i18nDescriptionId": 5007
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/764.json b/data/json/GemEquipmentDefinition/764.json
deleted file mode 100644
index 2f274114cc40c44cc4673b451c8e5c43410365be..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/764.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "764",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 764,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      392
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Lacrypabien Draconique",
-  "m_availability": 3,
-  "assetGuid": "742333ad5d0d4234f94e0a482e33ebc2",
-  "m_i18nNameId": 12129,
-  "m_i18nDescriptionId": 48021
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/768.json b/data/json/GemEquipmentDefinition/768.json
deleted file mode 100644
index 927323cf0d66653413cb35403a312d82b36e16ed..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/768.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "768",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 768,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      67386
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Sacrée Flamme",
-  "m_availability": 3,
-  "assetGuid": "4d5a2f943a31fa84c9d50829fbaffc00",
-  "m_i18nNameId": 83212,
-  "m_i18nDescriptionId": 20845
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/781.json b/data/json/GemEquipmentDefinition/781.json
deleted file mode 100644
index 2d5447b51e69cb4bcb1678ef3f435c4fc5a56ea2..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/781.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "781",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 781,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      71387
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Brisure Nécromique",
-  "m_availability": 3,
-  "assetGuid": "0c2467f12c290754fa508016a7bbe9c6",
-  "m_i18nNameId": 39377,
-  "m_i18nDescriptionId": 86253
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/782.json b/data/json/GemEquipmentDefinition/782.json
deleted file mode 100644
index b9aa935f4dcb6e958d71f69ed0776693a0e80670..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/782.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "782",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 782,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 63100
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      63100
-    ]
-  },
-  "m_displayName": "NOT USED - LÉGENDAIRE - FEU - Glorification",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 53839,
-  "m_i18nDescriptionId": 80278
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/783.json b/data/json/GemEquipmentDefinition/783.json
deleted file mode 100644
index 3a5d361efeb79fa2e52c30b7956035439ac535f8..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/783.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "783",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 783,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      64
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Vagalame Draconique",
-  "m_availability": 3,
-  "assetGuid": "32e07a244cc32d34b8cdda723476f779",
-  "m_i18nNameId": 28307,
-  "m_i18nDescriptionId": 46428
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/790.json b/data/json/GemEquipmentDefinition/790.json
deleted file mode 100644
index b47f92571cdb4787468974ab649934cf025d31c8..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/790.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "790",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 790,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      625
-    ]
-  },
-  "m_displayName": "SET - DÉCHAÎNÉ - Grondorage",
-  "m_availability": 3,
-  "assetGuid": "6f768df19d20f2840be2400b442252a2",
-  "m_i18nNameId": 84186,
-  "m_i18nDescriptionId": 10458
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/797.json b/data/json/GemEquipmentDefinition/797.json
deleted file mode 100644
index f667bed1b31020d1b569aab24f84606aec8487c9..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/797.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "797",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 797,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 653
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      653
-    ]
-  },
-  "m_displayName": "NOT USED - LÉGENDAIRE - AIR - Rédemption",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 44402,
-  "m_i18nDescriptionId": 90575
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/819.json b/data/json/GemEquipmentDefinition/819.json
deleted file mode 100644
index d41d0d0c8fea46da640028f46b849e3fe2241181..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/819.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "819",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 819,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 61029
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      61029
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - TERRE - Reconstruction",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 40464,
-  "m_i18nDescriptionId": 53921
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/83.json b/data/json/GemEquipmentDefinition/83.json
deleted file mode 100644
index f32f5acbfc1d210a04642a0ee4d0961fc4adb787..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/83.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "83",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 83,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      868
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Moellon Nécromique",
-  "m_availability": 3,
-  "assetGuid": "2851c2fb0b8d0f04dbb1107a55438f2c",
-  "m_i18nNameId": 78589,
-  "m_i18nDescriptionId": 85619
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/846.json b/data/json/GemEquipmentDefinition/846.json
deleted file mode 100644
index 931dfa9fdc0e5bbcfc143e489fbbdc7d2b14eedb..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/846.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "846",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 846,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 60232
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      60232
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - EAU - Jouvence",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 40885,
-  "m_i18nDescriptionId": 8846
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/858.json b/data/json/GemEquipmentDefinition/858.json
deleted file mode 100644
index 4c6a29ca7210a21a5b8c7523ee0b25d9f639b218..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/858.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "858",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 858,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 720
-        }
-      ]
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      720
-    ]
-  },
-  "m_displayName": "NOT USED - LÉGENDAIRE - EAU - Perfection",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 16760,
-  "m_i18nDescriptionId": 39681
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/861.json b/data/json/GemEquipmentDefinition/861.json
deleted file mode 100644
index 357014bca9bb62e5e409e63083a4751914f4b2d3..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/861.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "861",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 861,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 253
-        }
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 4,
-    "spells": [
-      253
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - NEUTRE - Atout",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 15171,
-  "m_i18nDescriptionId": 73851
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/866.json b/data/json/GemEquipmentDefinition/866.json
deleted file mode 100644
index d1d028bb5d139e36f6769b40b7e0c387d58b060d..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/866.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "866",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 866,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      197
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Protecteur Terreux",
-  "m_availability": 3,
-  "assetGuid": "f25b705248f5bac46abb67b394b44e93",
-  "m_i18nNameId": 597,
-  "m_i18nDescriptionId": 96647
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/878.json b/data/json/GemEquipmentDefinition/878.json
deleted file mode 100644
index 6861e5b2ca1c1b8c3316875d908f59ac20456f0d..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/878.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "878",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 878,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      67282
-    ]
-  },
-  "m_displayName": "SET - ARDENT - Ocoralina Magmatique",
-  "m_availability": 3,
-  "assetGuid": "328b49574b4a96940b8a3c9363e71de9",
-  "m_i18nNameId": 43039,
-  "m_i18nDescriptionId": 76755
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/881.json b/data/json/GemEquipmentDefinition/881.json
deleted file mode 100644
index 8ed0593f4b342377c618b7ae27a682b1997df4aa..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/881.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "881",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 881,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 124
-        }
-      ]
-    },
-    "element": 1,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 2,
-    "spells": [
-      124
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - FEU - Détonation",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 3433,
-  "m_i18nDescriptionId": 20093
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/887.json b/data/json/GemEquipmentDefinition/887.json
deleted file mode 100644
index 4a17db44b7a3e0e32e5a237be673abc671a6f4eb..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/887.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "887",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 887,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 398
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      398
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - TERRE - Appui",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 64497,
-  "m_i18nDescriptionId": 10784
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/90.json b/data/json/GemEquipmentDefinition/90.json
deleted file mode 100644
index 225e48cea4916a747046da6667e030568294dafc..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/90.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "90",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 90,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 60508
-        }
-      ]
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      60508
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - TERRE - Armature",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 58696,
-  "m_i18nDescriptionId": 33711
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/915.json b/data/json/GemEquipmentDefinition/915.json
deleted file mode 100644
index 046191f4a1135c468b9070075d1e16a62641750c..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/915.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "915",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 915,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 3,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 1,
-    "spells": [
-      68132
-    ]
-  },
-  "m_displayName": "SET - ROCHEUX - Bloc Agité",
-  "m_availability": 3,
-  "assetGuid": "b658c5cf2660ef54d884b7c928a20437",
-  "m_i18nNameId": 68913,
-  "m_i18nDescriptionId": 32018
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/934.json b/data/json/GemEquipmentDefinition/934.json
deleted file mode 100644
index 6d7359d5350eb2e6e73ce9fc007cc8af81228bd4..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/934.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "934",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 934,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 2000
-      }
-    ],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      761
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Draineuse Nécromique",
-  "m_availability": 3,
-  "assetGuid": "af90fd55cd2c4a3458b5c39b2873e946",
-  "m_i18nNameId": 31635,
-  "m_i18nDescriptionId": 93314
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/943.json b/data/json/GemEquipmentDefinition/943.json
deleted file mode 100644
index f5f0437148b274b39a0e15f2af6347afeca9c52d..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/943.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "943",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 943,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 5000
-      }
-    ],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 67,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      66509
-    ]
-  },
-  "m_displayName": "SET - DRACONIQUE - Ktunami Draconique",
-  "m_availability": 3,
-  "assetGuid": "5e7e281915c82a34bb1af6751e50ee6b",
-  "m_i18nNameId": 4415,
-  "m_i18nDescriptionId": 67069
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/957.json b/data/json/GemEquipmentDefinition/957.json
deleted file mode 100644
index d1d7d4d9249a129462d60d5aade640fe319bde7a..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/957.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "957",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 957,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      11
-    ]
-  },
-  "m_displayName": "SET - AQUEUX - Onde Deressac",
-  "m_availability": 3,
-  "assetGuid": "7de94e9cf20b2474190963b0735642c9",
-  "m_i18nNameId": 8756,
-  "m_i18nDescriptionId": 34362
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/966.json b/data/json/GemEquipmentDefinition/966.json
deleted file mode 100644
index de415b93ee484756871e5a0b42bb0b62f6233527..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/966.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "966",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 966,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 4,
-    "family": 68,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      324
-    ]
-  },
-  "m_displayName": "SET - NECROMIQUE - Effluve Nécromique",
-  "m_availability": 3,
-  "assetGuid": "7a262cd9d8ed2c04d8e2e78e93795b2b",
-  "m_i18nNameId": 66073,
-  "m_i18nDescriptionId": 27857
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/991.json b/data/json/GemEquipmentDefinition/991.json
deleted file mode 100644
index 2688dbceb27a8572e4d12e4cdf3637ddb59650df..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/991.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "991",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 991,
-    "passiveModifiers": [],
-    "merchantCosts": [
-      {
-        "type": "CurrencyCost",
-        "currencyType": 0,
-        "amount": 1000
-      }
-    ],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 2,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 0,
-    "spells": [
-      816
-    ]
-  },
-  "m_displayName": "COMMUN - EAU - Ogomatta Curatif",
-  "m_availability": 3,
-  "assetGuid": "71ba15ab238f6d14cbc2de8bc8aedf7b",
-  "m_i18nNameId": 47104,
-  "m_i18nDescriptionId": 4829
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/993.json b/data/json/GemEquipmentDefinition/993.json
deleted file mode 100644
index 90a64bba5626f9bf538e0087d5595769d12e1716..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/993.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "993",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 993,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 63479
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      63479
-    ]
-  },
-  "m_displayName": "NOT USED - RARE - AIR - Tornade Sauvage",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 89282,
-  "m_i18nDescriptionId": 40548
-}
\ No newline at end of file
diff --git a/data/json/GemEquipmentDefinition/996.json b/data/json/GemEquipmentDefinition/996.json
deleted file mode 100644
index 62eed692ea8c131eba38fd52751ca9f5a97a4e99..0000000000000000000000000000000000000000
--- a/data/json/GemEquipmentDefinition/996.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "996",
-  "m_jsonRepresentation": {
-    "type": "GemEquipmentDefinition",
-    "id": 996,
-    "passiveModifiers": [],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        {
-          "type": 25,
-          "id": 61045
-        }
-      ]
-    },
-    "element": 4,
-    "family": 0,
-    "spellEffectData": [],
-    "color": 3,
-    "spells": [
-      61045
-    ]
-  },
-  "m_displayName": "NOT USED - COMMUN - AIR - Siroco",
-  "m_availability": 0,
-  "assetGuid": "",
-  "m_i18nNameId": 17270,
-  "m_i18nDescriptionId": 11626
-}
\ No newline at end of file
diff --git a/data/json/GodDefinition/1.json b/data/json/GodDefinition/1.json
index 0e5b3686f71378fc168d28f9225c37542a4f321d..f48a359dad9d97cd1599385210d5ece9f761200d 100644
--- a/data/json/GodDefinition/1.json
+++ b/data/json/GodDefinition/1.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 1,
     "order": 0,
+    "selectableByUser": true,
     "defaultWeapon": 919,
     "weaponElementarySkill": [
       {
diff --git a/data/json/GodDefinition/10.json b/data/json/GodDefinition/10.json
index d1e9b4200f515cbe0b3edde23fbaca1a8e0910a7..e69ff1146dbf34e0c87aefb6230b6a0607acb065 100644
--- a/data/json/GodDefinition/10.json
+++ b/data/json/GodDefinition/10.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 10,
     "order": 0,
+    "selectableByUser": true,
     "defaultWeapon": 816,
     "weaponElementarySkill": [],
     "precomputedData": {
diff --git a/data/json/GodDefinition/11.json b/data/json/GodDefinition/11.json
index 3e808cb70bba4bb96afc2a5876e759a57f752103..3dfd0af663d93ed13bdfbe6422d39ad7e3bea952 100644
--- a/data/json/GodDefinition/11.json
+++ b/data/json/GodDefinition/11.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 11,
     "order": 8,
+    "selectableByUser": false,
     "defaultWeapon": 196,
     "weaponElementarySkill": [
       {
@@ -72,7 +73,7 @@
     }
   },
   "m_displayName": "Osamodas",
-  "m_availability": 0,
+  "m_availability": 2,
   "assetGuid": "2488a1c3929cc45d891849900da64697",
   "m_i18nNameId": 27026,
   "m_i18nDescriptionId": 50594
diff --git a/data/json/GodDefinition/12.json b/data/json/GodDefinition/12.json
index ea6e8011a96313a6186c13ab4a67b6b4bee0cdd4..a03a0ae6b57c7f45a5e9d97c6d11e368a19a6f5a 100644
--- a/data/json/GodDefinition/12.json
+++ b/data/json/GodDefinition/12.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 12,
     "order": 0,
+    "selectableByUser": true,
     "defaultWeapon": 816,
     "weaponElementarySkill": [],
     "precomputedData": {
diff --git a/data/json/GodDefinition/2.json b/data/json/GodDefinition/2.json
index f777801f72b902674a98bdaf6e5a1f5ad07e29ef..164ce9c17eab53412ed28a3935a500ab4950ff17 100644
--- a/data/json/GodDefinition/2.json
+++ b/data/json/GodDefinition/2.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 2,
     "order": 12,
+    "selectableByUser": true,
     "defaultWeapon": 846,
     "weaponElementarySkill": [
       {
@@ -16,8 +17,8 @@
             789,
             617,
             413,
-            795,
-            51
+            51,
+            898
           ]
         }
       },
@@ -30,8 +31,8 @@
             929,
             614,
             716,
-            118,
-            79
+            79,
+            15696
           ]
         }
       },
@@ -44,8 +45,8 @@
             907,
             913,
             177,
-            275,
-            734
+            734,
+            787
           ]
         }
       },
@@ -58,8 +59,8 @@
             406,
             56,
             4063,
-            81,
-            985
+            985,
+            240
           ]
         }
       }
diff --git a/data/json/GodDefinition/3.json b/data/json/GodDefinition/3.json
index 7ecceaed4fcede10ffc88c26d845717bfdd8430d..5f352df6a4eabb76fc5e7fed20267e507f784e61 100644
--- a/data/json/GodDefinition/3.json
+++ b/data/json/GodDefinition/3.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 3,
     "order": 10,
+    "selectableByUser": false,
     "defaultWeapon": 202,
     "weaponElementarySkill": [
       {
@@ -72,7 +73,7 @@
     }
   },
   "m_displayName": "Eniripsa",
-  "m_availability": 0,
+  "m_availability": 2,
   "assetGuid": "fca5923995a8b45a3b23e88b751d8b30",
   "m_i18nNameId": 60273,
   "m_i18nDescriptionId": 57613
diff --git a/data/json/GodDefinition/4.json b/data/json/GodDefinition/4.json
index b8b3f980580b235fc0b12088155c4ee16edd97fc..9033b3cd5458b9ce458f02988d4d9b7be6875db0 100644
--- a/data/json/GodDefinition/4.json
+++ b/data/json/GodDefinition/4.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 4,
     "order": 0,
+    "selectableByUser": true,
     "defaultWeapon": 898,
     "weaponElementarySkill": [],
     "precomputedData": {
diff --git a/data/json/GodDefinition/5.json b/data/json/GodDefinition/5.json
index 0884ff9f39885359d3403b25e6d2006083f27de9..6a679ddf454ec0e5d3fb157d8e2eb5af689728fa 100644
--- a/data/json/GodDefinition/5.json
+++ b/data/json/GodDefinition/5.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 5,
     "order": 0,
+    "selectableByUser": true,
     "defaultWeapon": 816,
     "weaponElementarySkill": [],
     "precomputedData": {
diff --git a/data/json/GodDefinition/6.json b/data/json/GodDefinition/6.json
index 93d24eea824c1e1fee6891aadc2804aec08baf1c..3946b6c2a91bdd01cbb84bb820173c0c6e173ed7 100644
--- a/data/json/GodDefinition/6.json
+++ b/data/json/GodDefinition/6.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 6,
     "order": 5,
+    "selectableByUser": false,
     "defaultWeapon": 937,
     "weaponElementarySkill": [
       {
@@ -72,7 +73,7 @@
     }
   },
   "m_displayName": "Sram",
-  "m_availability": 0,
+  "m_availability": 2,
   "assetGuid": "cd9e147b8b66c4ab6aa76949a2381eae",
   "m_i18nNameId": 89188,
   "m_i18nDescriptionId": 75439
diff --git a/data/json/GodDefinition/7.json b/data/json/GodDefinition/7.json
index 251af91ed1771f5148401e3009bfbbc5d8e63294..a6f089d5506fd1d7dd29d93a2a6ac68f5ff2b362 100644
--- a/data/json/GodDefinition/7.json
+++ b/data/json/GodDefinition/7.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 7,
     "order": 2,
+    "selectableByUser": true,
     "defaultWeapon": 945,
     "weaponElementarySkill": [
       {
@@ -16,7 +17,7 @@
             900,
             983,
             5064,
-            795,
+            589,
             211
           ]
         }
@@ -30,7 +31,7 @@
             234,
             114,
             645,
-            118,
+            432,
             905
           ]
         }
@@ -44,7 +45,7 @@
             720,
             77,
             5158,
-            275,
+            326,
             80
           ]
         }
@@ -58,7 +59,7 @@
             525,
             794,
             928,
-            81,
+            538,
             182
           ]
         }
diff --git a/data/json/GodDefinition/8.json b/data/json/GodDefinition/8.json
index 549fb01e5e65a467658f206737caec7f42d9ebb5..e2822ef2714475777480d7985257e2fd791fb631 100644
--- a/data/json/GodDefinition/8.json
+++ b/data/json/GodDefinition/8.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 8,
     "order": 3,
+    "selectableByUser": false,
     "defaultWeapon": 660,
     "weaponElementarySkill": [
       {
@@ -72,7 +73,7 @@
     }
   },
   "m_displayName": "Sacrieur",
-  "m_availability": 0,
+  "m_availability": 2,
   "assetGuid": "e2439504dcb3743a7b149a43b95f0712",
   "m_i18nNameId": 52524,
   "m_i18nDescriptionId": 32256
diff --git a/data/json/GodDefinition/9.json b/data/json/GodDefinition/9.json
index 2cded5f90ffcdf0aeabb97f4a68d3daf85084bae..0386bff7d5c814db832631979be1dcc3186d54f0 100644
--- a/data/json/GodDefinition/9.json
+++ b/data/json/GodDefinition/9.json
@@ -5,6 +5,7 @@
     "type": "GodDefinition",
     "id": 9,
     "order": 0,
+    "selectableByUser": true,
     "defaultWeapon": 816,
     "weaponElementarySkill": [],
     "precomputedData": {
diff --git a/data/json/KeyWord/KeyWord.json b/data/json/KeyWord/KeyWord.json
index 7d6380d227c9e44ba1dc1e55161ba272c86d807f..32a4a7354cc693ab10f6d8fc0c43c7ed3417f94b 100755
--- a/data/json/KeyWord/KeyWord.json
+++ b/data/json/KeyWord/KeyWord.json
@@ -56,12 +56,7 @@
     "m_i18nNameId": 68214,
     "m_i18nDescriptionId": 69007
   },
-  "RECONSTITUTION": {
-    "m_i18nNameId": 5190,
-    "m_i18nDescriptionId": 0
-  },
   "MECHANISM": {
-    "": "",
     "m_i18nNameId": 84627,
     "m_i18nDescriptionId": 49144
   },
@@ -106,8 +101,8 @@
     "m_i18nDescriptionId": 0
   },
   "LIFESTEAL": {
-    "m_i18nNameId": 61709,
-    "m_i18nDescriptionId": 6642
+    "m_i18nNameId": 55897,
+    "m_i18nDescriptionId": 39967
   },
   "WET": {
     "m_i18nNameId": 42713,
@@ -343,6 +338,10 @@
     "m_i18nNameId": 84727,
     "m_i18nDescriptionId": 4342
   },
+  "BOUCLIER": {
+    "m_i18nNameId": 84727,
+    "m_i18nDescriptionId": 4342
+  },
   "INITIATIVE": {
     "m_i18nNameId": 0,
     "m_i18nDescriptionId": 0
@@ -380,6 +379,10 @@
     "m_i18nNameId": 89927,
     "m_i18nDescriptionId": 0
   },
+  "MAGICALPOWERMAGICALPOWERVALUE": {
+    "m_i18nNameId": 89927,
+    "m_i18nDescriptionId": 0
+  },
   "RIP": {
     "m_i18nNameId": 0,
     "m_i18nDescriptionId": 0
@@ -416,11 +419,11 @@
   },
   "MUSTNOTDIE": {
     "m_i18nNameId": 17763,
-    "m_i18nDescriptionId": 0
+    "m_i18nDescriptionId": 48360
   },
   "LIFESTEALCHARACTER": {
-    "m_i18nNameId": 0,
-    "m_i18nDescriptionId": 0
+    "m_i18nNameId": 12810,
+    "m_i18nDescriptionId": 6642
   },
   "ASTRAL": {
     "m_i18nNameId": 28909,
@@ -451,7 +454,7 @@
     "m_i18nDescriptionId": 80822
   },
   "CHAMPIONAURA": {
-    "m_i18nNameId": 10629,
+    "m_i18nNameId": 59607,
     "m_i18nDescriptionId": 49462
   },
   "FIRESWORD": {
@@ -549,6 +552,142 @@
   "ADDNEUTRAL": {
     "m_i18nNameId": 57906,
     "m_i18nDescriptionId": 0
+  },
+  "INAMOVIBLE": {
+    "m_i18nNameId": 25566,
+    "m_i18nDescriptionId": 37377
+  },
+  "WAKFU": {
+    "m_i18nNameId": 24603,
+    "m_i18nDescriptionId": 0
+  },
+  "STASIS": {
+    "m_i18nNameId": 90157,
+    "m_i18nDescriptionId": 0
+  },
+  "PUSH": {
+    "m_i18nNameId": 92939,
+    "m_i18nDescriptionId": 37559
+  },
+  "FRUCTOSE": {
+    "m_i18nNameId": 85219,
+    "m_i18nDescriptionId": 34103
+  },
+  "DRAGEGG": {
+    "m_i18nNameId": 18442,
+    "m_i18nDescriptionId": 54690
+  },
+  "PARASITIZED": {
+    "m_i18nNameId": 31209,
+    "m_i18nDescriptionId": 78049
+  },
+  "SICK": {
+    "m_i18nNameId": 31920,
+    "m_i18nDescriptionId": 9987
+  },
+  "OFFENSIVESTANCE": {
+    "m_i18nNameId": 13102,
+    "m_i18nDescriptionId": 87656
+  },
+  "CONTAGIOUS": {
+    "m_i18nNameId": 71616,
+    "m_i18nDescriptionId": 25327
+  },
+  "WHISPERED": {
+    "m_i18nNameId": 17504,
+    "m_i18nDescriptionId": 41175
+  },
+  "AIRBORNE": {
+    "m_i18nNameId": 65694,
+    "m_i18nDescriptionId": 12028
+  },
+  "GLYCEMIA": {
+    "m_i18nNameId": 17845,
+    "m_i18nDescriptionId": 64360
+  },
+  "UNION": {
+    "m_i18nNameId": 99219,
+    "m_i18nDescriptionId": 69084
+  },
+  "ELECTRIFIED": {
+    "m_i18nNameId": 16073,
+    "m_i18nDescriptionId": 7376
+  },
+  "TAGGED": {
+    "m_i18nNameId": 38270,
+    "m_i18nDescriptionId": 62044
+  },
+  "ECORCHORUSPELIS": {
+    "m_i18nNameId": 83165,
+    "m_i18nDescriptionId": 25856
+  },
+  "BLOODY": {
+    "m_i18nNameId": 72253,
+    "m_i18nDescriptionId": 90378
+  },
+  "CRUMBLED": {
+    "m_i18nNameId": 89486,
+    "m_i18nDescriptionId": 54703
+  },
+  "BITTEN": {
+    "m_i18nNameId": 89486,
+    "m_i18nDescriptionId": 54703
+  },
+  "DEFENSIVESTANCE": {
+    "m_i18nNameId": 53305,
+    "m_i18nDescriptionId": 68570
+  },
+  "FEATHERED": {
+    "m_i18nNameId": 31059,
+    "m_i18nDescriptionId": 715
+  },
+  "REVENGE": {
+    "m_i18nNameId": 45198,
+    "m_i18nDescriptionId": 97892
+  },
+  "ARCONEMORTIS": {
+    "m_i18nNameId": 27540,
+    "m_i18nDescriptionId": 91150
+  },
+  "TENAILLE": {
+    "m_i18nNameId": 90379,
+    "m_i18nDescriptionId": 13012
+  },
+  "CRAQBOWLEUR": {
+    "m_i18nNameId": 76228,
+    "m_i18nDescriptionId": 67571
+  },
+  "EXALTED": {
+    "m_i18nNameId": 20418,
+    "m_i18nDescriptionId": 69918
+  },
+  "DOUBLE": {
+    "m_i18nNameId": 45912,
+    "m_i18nDescriptionId": 97173
+  },
+  "RIPOSTE": {
+    "m_i18nNameId": 87179,
+    "m_i18nDescriptionId": 88402
+  },
+  "STRIKEATTACK": {
+    "m_i18nNameId": 49313,
+    "m_i18nDescriptionId": 42798
+  },
+  "INFECTED": {
+    "m_i18nNameId": 43842,
+    "m_i18nDescriptionId": 69091
+  },
+  "PROTECTIVEWHISPER": {
+    "m_i18nNameId": 41586,
+    "m_i18nDescriptionId": 30344
+  },
+  "VENGEFULSPIRIT": {
+    "m_i18nNameId": 72787,
+    "m_i18nDescriptionId": 97258
+  },
+  "PREGNANT": {
+    "m_i18nNameId": 56569,
+    "m_i18nDescriptionId": 35216
   }
 }
 
diff --git a/data/json/LinkCustomEffectDefinition/2.json b/data/json/LinkCustomEffectDefinition/2.json
index b8405719fe8b46fc9de6279b54165edd7f90a5f4..9e29bcf133a625ee6fb5e1c9c8249778ed60eac3 100644
--- a/data/json/LinkCustomEffectDefinition/2.json
+++ b/data/json/LinkCustomEffectDefinition/2.json
@@ -8,7 +8,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "hugAR",
           "baseValue": 20.0,
           "factor": {
diff --git a/data/json/MapDefinition/167.json b/data/json/MapDefinition/167.json
index b3236eceaf513ee1ffd084bfcfe335ace9135198..4d650261878b4fc5401fc0d85c80b788d777ea3f 100644
--- a/data/json/MapDefinition/167.json
+++ b/data/json/MapDefinition/167.json
@@ -10,8 +10,8 @@
     },
     "variantId": -1
   },
-  "m_displayName": "Havre-île Test",
-  "m_availability": 3,
+  "m_displayName": "Havre-Ile Test",
+  "m_availability": 2,
   "m_cameraControllerSettingsType": 3,
   "m_cameraRotationBehaviour": 0,
   "assetGuid": "024661e2c01718242b5b29e40b48f150"
diff --git a/data/json/MapDefinition/229.json b/data/json/MapDefinition/229.json
index 43fd88135e714862236dc0693cd2b429720e28e5..e446ec04a0d918ea551f8228369009c19b8764fa 100644
--- a/data/json/MapDefinition/229.json
+++ b/data/json/MapDefinition/229.json
@@ -10,7 +10,7 @@
     },
     "variantId": -1
   },
-  "m_displayName": "Cochon - Fight Hub",
+  "m_displayName": "Cochon - Q1",
   "m_availability": 3,
   "m_cameraControllerSettingsType": 1,
   "m_cameraRotationBehaviour": 0,
diff --git a/data/json/MapDefinition/46.json b/data/json/MapDefinition/46.json
index af80567518419361d487cf0768a8e03b85ee4f52..1fee1726b6ed00a5285cd4ece673e4add1d356c4 100644
--- a/data/json/MapDefinition/46.json
+++ b/data/json/MapDefinition/46.json
@@ -10,7 +10,7 @@
     },
     "variantId": -1
   },
-  "m_displayName": "Cochon - Fight Sbire",
+  "m_displayName": "Cochon - Q3",
   "m_availability": 2,
   "m_cameraControllerSettingsType": 1,
   "m_cameraRotationBehaviour": 0,
diff --git a/data/json/MapDefinition/714.json b/data/json/MapDefinition/714.json
index 2aa95a194325039e7e5bd3705f92abb878ae1dee..7b1000f7daaa491153f67ca2d22efd49d7fdf73e 100644
--- a/data/json/MapDefinition/714.json
+++ b/data/json/MapDefinition/714.json
@@ -10,7 +10,7 @@
     },
     "variantId": -1
   },
-  "m_displayName": "Bwork - Quest map 1",
+  "m_displayName": "Bwork - Q1",
   "m_availability": 3,
   "m_cameraControllerSettingsType": 1,
   "m_cameraRotationBehaviour": 0,
diff --git a/data/json/MapDefinition/793.json b/data/json/MapDefinition/793.json
index 3f09b0f23cc26ecb4ef61a7ba391756d3a9674d6..71ad265b01d5ccc37f453dff587e7b391232c417 100644
--- a/data/json/MapDefinition/793.json
+++ b/data/json/MapDefinition/793.json
@@ -10,7 +10,7 @@
     },
     "variantId": -1
   },
-  "m_displayName": "Chafer - Fight Sbires",
+  "m_displayName": "Chafer - Q3",
   "m_availability": 2,
   "m_cameraControllerSettingsType": 1,
   "m_cameraRotationBehaviour": 0,
diff --git a/data/json/MapDefinition/828.json b/data/json/MapDefinition/828.json
index 8b3c10ff97a7f60562bbb313e401352db1aa516d..b834ece4be5f4134e46e04e81a1cc2fac16e351e 100644
--- a/data/json/MapDefinition/828.json
+++ b/data/json/MapDefinition/828.json
@@ -10,7 +10,7 @@
     },
     "variantId": -1
   },
-  "m_displayName": "Chafer - Fight Hub",
+  "m_displayName": "Chafer - Q1",
   "m_availability": 3,
   "m_cameraControllerSettingsType": 1,
   "m_cameraRotationBehaviour": 0,
diff --git a/data/json/MerchantInventoryDefinition/13.json b/data/json/MerchantInventoryDefinition/13.json
index 67f1369a83ca17008393d9d3eca7cbb21c2661ba..bd65059bccf3e2174d0c858efb93e9b45bfc74a5 100644
--- a/data/json/MerchantInventoryDefinition/13.json
+++ b/data/json/MerchantInventoryDefinition/13.json
@@ -15,7 +15,7 @@
         "v": 0.5
       },
       {
-        "k": 33,
+        "k": 25,
         "v": 0.5
       }
     ],
diff --git a/data/json/MerchantInventoryDefinition/149.json b/data/json/MerchantInventoryDefinition/149.json
index 6f95d046de7b4b8e61208f31caa597c010b4334f..4feef7cf9fdfdb053f2d2f5f473a4567bc9961eb 100644
--- a/data/json/MerchantInventoryDefinition/149.json
+++ b/data/json/MerchantInventoryDefinition/149.json
@@ -7,75 +7,59 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
     "resetCost": [],
     "entries": [
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 85
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 85
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 621
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 621
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 50.0,
-            "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 568
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
             }
           }
         ]
@@ -84,116 +68,63 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 10.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
             }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 845
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
             }
           }
         ]
       },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 96
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 96
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 80.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 50.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 188
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           }
         ]
@@ -202,57 +133,36 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
           },
           {
-            "k": 10.0,
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
           },
           {
-            "k": 50.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 745
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
           }
         ]
@@ -263,159 +173,23 @@
       "type": "OwnableInfoListWithWeightSelector",
       "entries": [
         {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
+          "k": 80.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
           "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 01",
+  "m_displayName": "BWORK - Donjon 01-10",
   "m_availability": 3,
   "m_merchantBubble": 98114
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/16.json b/data/json/MerchantInventoryDefinition/16.json
index 96449554ac06b85eb88c0127a05f5d7b7eb83afe..5f1568dceca34d5abaa9fd3d5c9d0a0458a5166d 100644
--- a/data/json/MerchantInventoryDefinition/16.json
+++ b/data/json/MerchantInventoryDefinition/16.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,333 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 85
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 621
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 85
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 621
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 85
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 621
+                  }
+                }
+              ]
+            }
+          },
           {
             "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
+              "referenceId": 96
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 85
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 621
+                  }
+                }
+              ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
               "referenceId": 96
             }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
+            }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 831
+              "referenceId": 440
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      77
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 60.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 03",
+  "m_displayName": "BWORK - Donjon 16-20",
   "m_availability": 3,
   "m_merchantBubble": 11306
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/18.json b/data/json/MerchantInventoryDefinition/18.json
index e3d54cd2212d83482dc129e5eaa9899cb6f6756d..532db3af79fc8e5c0972654c7d452b1dd7cf143d 100644
--- a/data/json/MerchantInventoryDefinition/18.json
+++ b/data/json/MerchantInventoryDefinition/18.json
@@ -15,7 +15,7 @@
         "v": 0.5
       },
       {
-        "k": 33,
+        "k": 25,
         "v": 0.5
       }
     ],
diff --git a/data/json/MerchantInventoryDefinition/21.json b/data/json/MerchantInventoryDefinition/21.json
deleted file mode 100644
index a1c92d88fdb4e36a98baccc7b9e112c588714fbd..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/21.json
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "21",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 21,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [
-      52
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "CHAFER - Donjon 08",
-  "m_availability": 3,
-  "m_merchantBubble": 43646
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/24.json b/data/json/MerchantInventoryDefinition/24.json
index c61b3bd28893f15fdf8133092e7a1054c3d610d0..00caec5aa008b9b06be4d402b1cc513d28a5d4bd 100644
--- a/data/json/MerchantInventoryDefinition/24.json
+++ b/data/json/MerchantInventoryDefinition/24.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,542 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 611
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 789
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 687
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 611
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 789
+                  }
+                }
+              ]
+            }
+          },
           {
             "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 687
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
               "referenceId": 470
             }
           },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 470
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 596
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
+              "referenceId": 505
             }
           },
           {
-            "k": 50.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 789
+              "referenceId": 457
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      79
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 40.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 05",
+  "m_displayName": "COCHON - Donjon 26-30",
   "m_availability": 3,
   "m_merchantBubble": 25540
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/26.json b/data/json/MerchantInventoryDefinition/26.json
deleted file mode 100644
index 2629fd691607481d23c3a537e7c0c8dd4831ea8b..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/26.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "26",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 26,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 753
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 845
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 229
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 244
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 188
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 389
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 213
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 745
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 933
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 633
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 568
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 807
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 601
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 135
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 144
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 376
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 666
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 847
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 507
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 221
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 844
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 231
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 664
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 561
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 534
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 143
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 490
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 945
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 998
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 953
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 381
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 492
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 620
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 182
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 625
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 141
-        }
-      }
-    ],
-    "subInventories": []
-  },
-  "m_displayName": "CHAFER - Hub",
-  "m_availability": 0,
-  "m_merchantBubble": 57963
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/37.json b/data/json/MerchantInventoryDefinition/37.json
index 39d70ea25d1acdcd3430376ce97faec502da9222..be3e34215661901fda31dfc4c187c80c8b12812b 100644
--- a/data/json/MerchantInventoryDefinition/37.json
+++ b/data/json/MerchantInventoryDefinition/37.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,542 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 502
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 4
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 905
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 502
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 4
+                  }
+                }
+              ]
+            }
+          },
           {
             "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 905
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
               "referenceId": 244
             }
           },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 244
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 779
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
+              "referenceId": 505
             }
           },
           {
-            "k": 50.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 4
+              "referenceId": 457
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      95
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 40.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 05",
+  "m_displayName": "CHAFER - Donjon 26-30",
   "m_availability": 3,
   "m_merchantBubble": 1849
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/39.json b/data/json/MerchantInventoryDefinition/39.json
deleted file mode 100644
index a6964e2629032accf9f2102fe775dedf537428c3..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/39.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "39",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 39,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 41
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 532
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 728
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 873
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 419
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "CHAFER - Donjon 21",
-  "m_availability": 3,
-  "m_merchantBubble": 54598
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/41.json b/data/json/MerchantInventoryDefinition/41.json
deleted file mode 100644
index 0980aa5fe69ccc65314442f1eb92056003a9c527..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/41.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "41",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 41,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 125
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 555
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 359
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 302
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 339
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 401
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 61
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 86
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 642
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 72
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 309
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 276
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 657
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 815
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 445
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 52
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 261
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 32
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 378
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 976
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 788
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 83
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 483
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 661
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 497
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 911
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 191
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 477
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 830
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 36
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 637
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 202
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 196
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 864
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 366
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 161
-        }
-      }
-    ],
-    "subInventories": []
-  },
-  "m_displayName": "COCHON - Hub",
-  "m_availability": 0,
-  "m_merchantBubble": 33972
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/42.json b/data/json/MerchantInventoryDefinition/42.json
index 2c010d516f7afc24d3c35e5c020ef682be4a5a47..c282370caca5c2b177e2a72f099999e5c081aa28 100644
--- a/data/json/MerchantInventoryDefinition/42.json
+++ b/data/json/MerchantInventoryDefinition/42.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,333 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 611
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 789
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 611
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 789
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 611
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 789
+                  }
+                }
+              ]
+            }
+          },
           {
             "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
+              "referenceId": 687
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 611
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 789
+                  }
+                }
+              ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
               "referenceId": 687
             }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
+            }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 83
+              "referenceId": 596
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      61
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 60.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 03",
+  "m_displayName": "COCHON - Donjon 16-20",
   "m_availability": 3,
   "m_merchantBubble": 90851
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/46.json b/data/json/MerchantInventoryDefinition/46.json
deleted file mode 100644
index d4c4aa9ddeeb88063fb097c31ea0ff67cef6cf0e..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/46.json
+++ /dev/null
@@ -1,804 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "46",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 46,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 502
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 297
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 669
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 151
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 305
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 319
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 170
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 41
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 532
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 728
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 873
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 419
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "CHAFER - Donjon 11",
-  "m_availability": 3,
-  "m_merchantBubble": 9702
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/5.json b/data/json/MerchantInventoryDefinition/5.json
index adbffbfcc65bc28c775574349d6baf26c79dd1cc..f5f29459b6034e2ebbbe520aaf67a6f5aa6948a0 100644
--- a/data/json/MerchantInventoryDefinition/5.json
+++ b/data/json/MerchantInventoryDefinition/5.json
@@ -7,75 +7,59 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
     "resetCost": [],
     "entries": [
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 502
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 502
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 4
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 4
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 50.0,
-            "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 568
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
             }
           }
         ]
@@ -84,116 +68,63 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 10.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
             }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 845
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
             }
           }
         ]
       },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 905
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 905
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 80.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 50.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 188
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           }
         ]
@@ -202,57 +133,36 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
           },
           {
-            "k": 10.0,
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
           },
           {
-            "k": 50.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 745
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
           }
         ]
@@ -263,159 +173,23 @@
       "type": "OwnableInfoListWithWeightSelector",
       "entries": [
         {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
+          "k": 80.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
           "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 01",
+  "m_displayName": "CHAFER - Donjon 01-10",
   "m_availability": 3,
   "m_merchantBubble": 45886
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/50.json b/data/json/MerchantInventoryDefinition/50.json
deleted file mode 100644
index f9b8a61821b98c5157d87ce3a38532fce8e3dbac..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/50.json
+++ /dev/null
@@ -1,804 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "50",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 50,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 502
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 502
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 669
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 297
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 151
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 319
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 305
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 170
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 41
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 532
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 728
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 873
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 419
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "BWORK - Donjon 11",
-  "m_availability": 3,
-  "m_merchantBubble": 27998
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/52.json b/data/json/MerchantInventoryDefinition/52.json
index 4a8391648cdc08f8328b21fcf0f7a5bf16681849..76cfa2d6faaafcc5f5378f7a4bab26a31ec9b360 100644
--- a/data/json/MerchantInventoryDefinition/52.json
+++ b/data/json/MerchantInventoryDefinition/52.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,540 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 244
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 779
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 244
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 779
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
           {
             "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
+              "referenceId": 457
             }
           },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 297
+              "referenceId": 927
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      62
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 262
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 927
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 07",
+  "m_displayName": "CHAFER - Donjon 41-50",
   "m_availability": 3,
   "m_merchantBubble": 51614
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/53.json b/data/json/MerchantInventoryDefinition/53.json
index 0040431c5c2ee0c1102d08b9144ad47dea86d95e..58030cb8ab28c1cea44f39d476ca95616bf846a7 100644
--- a/data/json/MerchantInventoryDefinition/53.json
+++ b/data/json/MerchantInventoryDefinition/53.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,333 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 502
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 4
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 502
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 4
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 502
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 4
+                  }
+                }
+              ]
+            }
+          },
           {
             "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
+              "referenceId": 905
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 502
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 4
+                  }
+                }
+              ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
               "referenceId": 905
             }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
+            }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 721
+              "referenceId": 779
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      57
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 60.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 03",
+  "m_displayName": "CHAFER - Donjon 16-20",
   "m_availability": 3,
   "m_merchantBubble": 47202
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/54.json b/data/json/MerchantInventoryDefinition/54.json
index 0a60eb1179948d1fe94d37b7c3c3279857bf0da3..d295fdcaf07653aadb8f7877ce26c7af2d83cbde 100644
--- a/data/json/MerchantInventoryDefinition/54.json
+++ b/data/json/MerchantInventoryDefinition/54.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,540 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 45
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 440
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 45
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 440
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
           {
             "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
+              "referenceId": 457
             }
           },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 669
+              "referenceId": 927
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      84
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 262
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 927
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 07",
+  "m_displayName": "BWORK - Donjon 41-50",
   "m_availability": 3,
   "m_merchantBubble": 19038
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/55.json b/data/json/MerchantInventoryDefinition/55.json
index 4cf575ef71a4f27e41549605c7ab7abcdfa819cd..0e1c0c6a535b3dcf2bf1337d3458f22b2700dd01 100644
--- a/data/json/MerchantInventoryDefinition/55.json
+++ b/data/json/MerchantInventoryDefinition/55.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -25,7 +33,77 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 60.0,
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 470
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 596
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -40,204 +118,552 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
+                    "referenceId": 596
                   }
                 }
               ]
             }
           },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           },
           {
             "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
                 {
-                  "k": 50.0,
+                  "k": 20.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
+                    "referenceId": 174
                   }
                 },
                 {
-                  "k": 50.0,
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 30.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 262
                   }
                 }
               ]
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      24
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 927
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 06",
+  "m_displayName": "COCHON - Donjon 31-40",
   "m_availability": 3,
   "m_merchantBubble": 41159
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/56.json b/data/json/MerchantInventoryDefinition/56.json
index c97c5930ec51fd601dfe38655096d44994a3fc56..ce7167d35eb678cbf6fd0dd863a1d79193b6bd73 100644
--- a/data/json/MerchantInventoryDefinition/56.json
+++ b/data/json/MerchantInventoryDefinition/56.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -25,7 +33,26 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 60.0,
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 85
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 621
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -33,21 +60,33 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
+                    "referenceId": 85
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
+                    "referenceId": 621
                   }
                 }
               ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 96
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -55,21 +94,52 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
+                    "referenceId": 85
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
+                    "referenceId": 621
                   }
                 }
               ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 96
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -77,182 +147,369 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 502
+                    "referenceId": 45
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
+                    "referenceId": 440
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
                   }
                 }
               ]
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      16
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 40.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 04",
+  "m_displayName": "BWORK - Donjon 21-25",
   "m_availability": 3,
   "m_merchantBubble": 9682
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/57.json b/data/json/MerchantInventoryDefinition/57.json
index 681944b1b0228a8d07c7f00b70b18943afa45cb4..76700e112d6c57478763b9b7e3f2f236a04f1b0e 100644
--- a/data/json/MerchantInventoryDefinition/57.json
+++ b/data/json/MerchantInventoryDefinition/57.json
@@ -7,47 +7,60 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
     "resetCost": [],
     "entries": [
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 502
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 4
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
             "k": 50.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 502
             }
           },
           {
-            "k": 10.0,
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 4
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -55,45 +68,24 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
+                    "referenceId": 502
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
+                    "referenceId": 4
                   }
                 }
               ]
             }
           },
           {
-            "k": 40.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 568
-                    }
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 845
-                    }
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 905
             }
           }
         ]
@@ -102,131 +94,66 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 50.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
             }
           },
           {
-            "k": 40.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 188
-                    }
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 745
-                    }
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
             }
           }
         ]
       },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 905
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 70.0,
+            "k": 60.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 20.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 85
+              "referenceId": 505
             }
           }
         ]
@@ -235,54 +162,24 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 70.0,
+            "k": 60.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 20.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 611
+              "referenceId": 505
             }
           }
         ]
@@ -291,187 +188,110 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 30.0,
+            "k": 60.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
+              "referenceId": 174
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
+              "referenceId": 690
             }
           },
           {
-            "k": 50.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 502
+              "referenceId": 505
             }
           }
         ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 60.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 02",
+  "m_displayName": "CHAFER - Donjon 11-15",
   "m_availability": 3,
   "m_merchantBubble": 36792
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/59.json b/data/json/MerchantInventoryDefinition/59.json
deleted file mode 100644
index 22bb0a4d0b2305bcc49204d5d4975935f61a2f84..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/59.json
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "59",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 59,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [
-      72
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "COCHON - Donjon 08",
-  "m_availability": 3,
-  "m_merchantBubble": 95844
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/61.json b/data/json/MerchantInventoryDefinition/61.json
index a265d88f682b03898ba58e67ab0732d230ce1c25..1c9e5d6b1b5eeca3118828cde807bd0c512d00b6 100644
--- a/data/json/MerchantInventoryDefinition/61.json
+++ b/data/json/MerchantInventoryDefinition/61.json
@@ -7,47 +7,60 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
     "resetCost": [],
     "entries": [
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 611
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 789
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
             "k": 50.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 611
             }
           },
           {
-            "k": 10.0,
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 789
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -55,45 +68,24 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
+                    "referenceId": 611
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
+                    "referenceId": 789
                   }
                 }
               ]
             }
           },
           {
-            "k": 40.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 568
-                    }
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 845
-                    }
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 687
             }
           }
         ]
@@ -102,131 +94,66 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 50.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
             }
           },
           {
-            "k": 40.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 188
-                    }
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 745
-                    }
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
             }
           }
         ]
       },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 687
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 70.0,
+            "k": 60.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 20.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 85
+              "referenceId": 505
             }
           }
         ]
@@ -235,54 +162,24 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 70.0,
+            "k": 60.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 20.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 502
+              "referenceId": 505
             }
           }
         ]
@@ -291,187 +188,110 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 30.0,
+            "k": 60.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
+              "referenceId": 174
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
+              "referenceId": 690
             }
           },
           {
-            "k": 50.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 611
+              "referenceId": 505
             }
           }
         ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 60.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 02",
+  "m_displayName": "COCHON - Donjon 11-15",
   "m_availability": 3,
   "m_merchantBubble": 24381
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/62.json b/data/json/MerchantInventoryDefinition/62.json
index 0da19316b051c0ff045443079aaff9f9dd1a4880..3499ff2c26651e5a60ad2d05c609c200e80058e4 100644
--- a/data/json/MerchantInventoryDefinition/62.json
+++ b/data/json/MerchantInventoryDefinition/62.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -25,7 +33,77 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 60.0,
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 244
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 779
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -40,204 +118,552 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
+                    "referenceId": 779
                   }
                 }
               ]
             }
           },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           },
           {
             "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
                 {
-                  "k": 50.0,
+                  "k": 20.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
+                    "referenceId": 174
                   }
                 },
                 {
-                  "k": 50.0,
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 30.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 262
                   }
                 }
               ]
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      37
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 927
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 06",
+  "m_displayName": "CHAFER - Donjon 31-40",
   "m_availability": 3,
   "m_merchantBubble": 9816
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/65.json b/data/json/MerchantInventoryDefinition/65.json
deleted file mode 100644
index 7d256698e184a134ce0894e44abef49391581788..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/65.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "65",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 65,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 41
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 532
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 728
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 873
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 419
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "COCHON - Donjon 21",
-  "m_availability": 3,
-  "m_merchantBubble": 23932
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/66.json b/data/json/MerchantInventoryDefinition/66.json
deleted file mode 100644
index d3ac941ff5d7bf3a616407b8a0084ff234903517..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/66.json
+++ /dev/null
@@ -1,608 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "66",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 66,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 80.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 20.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 100,
-              "max": 100
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 10,
-              "max": 10
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 41
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 532
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 728
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 873
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 419
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "BWORK - Donjon 21",
-  "m_availability": 3,
-  "m_merchantBubble": 41249
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/67.json b/data/json/MerchantInventoryDefinition/67.json
deleted file mode 100644
index 44a83163d9b4c657065423ee7d5bfcb30021d70d..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/67.json
+++ /dev/null
@@ -1,243 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "67",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 67,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [
-      54
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "BWORK - Donjon 08",
-  "m_availability": 3,
-  "m_merchantBubble": 12401
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/72.json b/data/json/MerchantInventoryDefinition/72.json
index 8079e551f22a9cc627e533855cb3e51e3e0d8bf2..cdeb34017dbe96e13da4bb6e86f71bf028516d2c 100644
--- a/data/json/MerchantInventoryDefinition/72.json
+++ b/data/json/MerchantInventoryDefinition/72.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,540 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 470
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 596
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 470
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 596
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
           {
             "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
+              "referenceId": 457
             }
           },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 151
+              "referenceId": 927
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      55
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 262
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 927
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 07",
+  "m_displayName": "COCHON - Donjon 41-50",
   "m_availability": 3,
   "m_merchantBubble": 53116
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/73.json b/data/json/MerchantInventoryDefinition/73.json
deleted file mode 100644
index b75b738f5ad7298d62cfa464f03923021ae7891f..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/73.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "73",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 73,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
-            }
-          },
-          {
-            "k": 50.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 319
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [
-      67
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "BWORK - Donjon 10",
-  "m_availability": 3,
-  "m_merchantBubble": 50188
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/74.json b/data/json/MerchantInventoryDefinition/74.json
index db7dd9f53238670a948ca8cf3776c2f1e8932bad..f85cd6953ed5855808f8071a2c6ae87ec3950959 100644
--- a/data/json/MerchantInventoryDefinition/74.json
+++ b/data/json/MerchantInventoryDefinition/74.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -24,190 +32,542 @@
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 85
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 621
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 96
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 85
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 621
+                  }
+                }
+              ]
+            }
+          },
           {
             "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 96
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
               "referenceId": 45
             }
           },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 45
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 440
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
+              "referenceId": 505
             }
           },
           {
-            "k": 50.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 621
+              "referenceId": 457
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      56
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 40.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 05",
+  "m_displayName": "BWORK - Donjon 26-30",
   "m_availability": 3,
   "m_merchantBubble": 83758
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/75.json b/data/json/MerchantInventoryDefinition/75.json
index 6ced4d73f3d2f09c48820dcf8cc0cf73585a6031..fedf9800c1257bc0c76d1f7a90a18dd031b2107c 100644
--- a/data/json/MerchantInventoryDefinition/75.json
+++ b/data/json/MerchantInventoryDefinition/75.json
@@ -15,7 +15,7 @@
         "v": 0.5
       },
       {
-        "k": 33,
+        "k": 25,
         "v": 0.5
       }
     ],
diff --git a/data/json/MerchantInventoryDefinition/77.json b/data/json/MerchantInventoryDefinition/77.json
index dcc0d256fe8c2bff179b3b3078981c96279402be..2e17cc1b9dcebc9aef3185498820359bb489d731 100644
--- a/data/json/MerchantInventoryDefinition/77.json
+++ b/data/json/MerchantInventoryDefinition/77.json
@@ -7,47 +7,60 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
     "resetCost": [],
     "entries": [
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 85
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 621
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
             "k": 50.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 85
             }
           },
           {
-            "k": 10.0,
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 621
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -55,45 +68,24 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
+                    "referenceId": 85
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
+                    "referenceId": 621
                   }
                 }
               ]
             }
           },
           {
-            "k": 40.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 568
-                    }
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 845
-                    }
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 96
             }
           }
         ]
@@ -102,131 +94,66 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 50.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 45
             }
           },
           {
-            "k": 40.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 188
-                    }
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "OwnableItemInfo",
-                    "ownableId": {
-                      "typeEnum": 5,
-                      "value": 745
-                    }
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 440
             }
           }
         ]
       },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 96
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 70.0,
+            "k": 60.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 20.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 502
+              "referenceId": 505
             }
           }
         ]
@@ -235,54 +162,24 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 70.0,
+            "k": 60.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 45
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 96
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           },
           {
-            "k": 20.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 611
+              "referenceId": 505
             }
           }
         ]
@@ -291,187 +188,110 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 30.0,
+            "k": 60.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 45
+              "referenceId": 174
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
+              "referenceId": 690
             }
           },
           {
-            "k": 50.0,
+            "k": 10.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 85
+              "referenceId": 505
             }
           }
         ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 60.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 60.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 02",
+  "m_displayName": "BWORK - Donjon 11-15",
   "m_availability": 3,
   "m_merchantBubble": 22714
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/79.json b/data/json/MerchantInventoryDefinition/79.json
index dcb29d1211b336dd59f1a9ffe640dba16270d0d8..5898337bf2d6377c66863dac31f054ed764557c6 100644
--- a/data/json/MerchantInventoryDefinition/79.json
+++ b/data/json/MerchantInventoryDefinition/79.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -25,7 +33,26 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 60.0,
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 611
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 789
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -33,21 +60,33 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
+                    "referenceId": 611
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
+                    "referenceId": 789
                   }
                 }
               ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 687
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -55,21 +94,52 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
+                    "referenceId": 611
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
+                    "referenceId": 789
                   }
                 }
               ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 687
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -77,182 +147,369 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
+                    "referenceId": 470
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 502
+                    "referenceId": 596
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
                   }
                 }
               ]
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      42
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 40.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 04",
+  "m_displayName": "COCHON - Donjon 21-25",
   "m_availability": 3,
   "m_merchantBubble": 77387
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/82.json b/data/json/MerchantInventoryDefinition/82.json
index cc26d2c411ba1d4a6f71c474ef9490ca03c29ab7..1f244f06e16b179522c9ede7e9aae594f52a9af0 100644
--- a/data/json/MerchantInventoryDefinition/82.json
+++ b/data/json/MerchantInventoryDefinition/82.json
@@ -15,7 +15,7 @@
         "v": 0.9
       },
       {
-        "k": 33,
+        "k": 25,
         "v": 0.9
       }
     ],
diff --git a/data/json/MerchantInventoryDefinition/84.json b/data/json/MerchantInventoryDefinition/84.json
index 4460c0f991e2ae15b4a088b7120ac9c234f7cf66..9410061640b16e738219089dea8e9271d18e1571 100644
--- a/data/json/MerchantInventoryDefinition/84.json
+++ b/data/json/MerchantInventoryDefinition/84.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -25,7 +33,77 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 60.0,
+            "k": 70.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 45
+                  }
+                },
+                {
+                  "k": 50.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 440
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -40,204 +118,552 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
+                    "referenceId": 440
                   }
                 }
               ]
             }
           },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
           {
             "k": 20.0,
             "v": {
               "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 96
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
             }
           },
           {
             "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 927
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
                 {
-                  "k": 50.0,
+                  "k": 20.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
+                    "referenceId": 174
                   }
                 },
                 {
-                  "k": 50.0,
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 927
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 30.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 262
                   }
                 }
               ]
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      74
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 262
             }
           }
-        },
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 927
           }
         }
       ]
     }
   },
-  "m_displayName": "BWORK - Donjon 06",
+  "m_displayName": "BWORK - Donjon 31-40",
   "m_availability": 3,
   "m_merchantBubble": 37167
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/85.json b/data/json/MerchantInventoryDefinition/85.json
index da48f19b6a7dfa640ee36eaedb305d1b255edf47..5b97cc4c6a287a1e89b9405fbbdf88212c5ff0f9 100644
--- a/data/json/MerchantInventoryDefinition/85.json
+++ b/data/json/MerchantInventoryDefinition/85.json
@@ -15,7 +15,7 @@
         "v": 0.5
       },
       {
-        "k": 33,
+        "k": 25,
         "v": 0.5
       }
     ],
diff --git a/data/json/MerchantInventoryDefinition/86.json b/data/json/MerchantInventoryDefinition/86.json
deleted file mode 100644
index af30b6e53aa1d7ccaae3f7674c225396fe6ac79f..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/86.json
+++ /dev/null
@@ -1,804 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "86",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 86,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 70.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 502
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 83
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 789
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 721
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 831
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 151
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 669
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 297
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 4
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 621
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 10.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 60.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 70.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 170
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 319
-                  }
-                },
-                {
-                  "k": 15.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 305
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 40,
-              "max": 40
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 5,
-              "max": 5
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 41
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 532
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 728
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 873
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 419
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 1,
-              "max": 1
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "COCHON - Donjon 11",
-  "m_availability": 3,
-  "m_merchantBubble": 19816
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/90.json b/data/json/MerchantInventoryDefinition/90.json
deleted file mode 100644
index 647f7fd9b60704b5a9166d11c6b459448bb32d31..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/90.json
+++ /dev/null
@@ -1,299 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "90",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 90,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 753
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 845
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 229
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 244
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 188
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 389
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 213
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 745
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 933
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 633
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 568
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 807
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 601
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 135
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 144
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 376
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 666
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 847
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 507
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 221
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 844
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 231
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 664
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 561
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 534
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 143
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 490
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 945
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 998
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 953
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 381
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 492
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 620
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 182
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 625
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 3,
-          "value": 141
-        }
-      },
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 1.0,
-            "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 3,
-                "value": 75
-              }
-            }
-          },
-          {
-            "k": 1.0,
-            "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 3,
-                "value": 191
-              },
-              "count": {
-                "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": []
-  },
-  "m_displayName": "BWORK - Hub",
-  "m_availability": 0,
-  "m_merchantBubble": 80180
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/95.json b/data/json/MerchantInventoryDefinition/95.json
index c04c7c3b430b198dc2becbf4693bbae5b2fada94..4583fe3155c2ecf74454ed667fd9d3c4278ded9f 100644
--- a/data/json/MerchantInventoryDefinition/95.json
+++ b/data/json/MerchantInventoryDefinition/95.json
@@ -7,15 +7,23 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 23,
+        "v": 1.0
+      },
+      {
+        "k": 52,
         "v": 1.0
       }
     ],
@@ -25,7 +33,26 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 60.0,
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 502
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 4
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -33,21 +60,33 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 244
+                    "referenceId": 502
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
+                    "referenceId": 4
                   }
                 }
               ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 905
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -55,21 +94,52 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 905
+                    "referenceId": 502
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
+                    "referenceId": 4
                   }
                 }
               ]
             }
           },
           {
-            "k": 20.0,
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 905
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 244
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 779
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 70.0,
             "v": {
               "type": "OwnableInfoListWithWeightSelector",
               "entries": [
@@ -77,182 +147,369 @@
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 85
+                    "referenceId": 244
                   }
                 },
                 {
                   "k": 50.0,
                   "v": {
                     "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 611
+                    "referenceId": 779
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
                   }
                 }
               ]
             }
           }
         ]
-      }
-    ],
-    "subInventories": [
-      53
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 505
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 457
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 174
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 690
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 505
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 457
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "k": 50.0,
+            "v": {
+              "type": "OwnableInfoListWithWeightSelector",
+              "entries": [
+                {
+                  "k": 40.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 830
+                  }
+                },
+                {
+                  "k": 30.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 411
+                  }
+                },
+                {
+                  "k": 20.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 198
+                  }
+                },
+                {
+                  "k": 10.0,
+                  "v": {
+                    "type": "RefOwnableInfoListWithProfileSelector",
+                    "referenceId": 641
+                  }
+                }
+              ]
             }
           }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
             }
           }
-        },
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 40.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
+            }
+          },
+          {
+            "k": 30.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          },
+          {
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 198
+            }
+          },
+          {
+            "k": 10.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 641
+            }
+          }
+        ]
+      }
+    ],
+    "subInventories": [],
+    "defaultEntrie": {
+      "type": "OwnableInfoListWithWeightSelector",
+      "entries": [
         {
-          "k": 5.0,
+          "k": 40.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
-          "k": 5.0,
+          "k": 30.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         },
         {
-          "k": 5.0,
+          "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 505
           }
         },
         {
-          "k": 5.0,
+          "k": 10.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 457
           }
         }
       ]
     }
   },
-  "m_displayName": "CHAFER - Donjon 04",
+  "m_displayName": "CHAFER - Donjon 21-25",
   "m_availability": 3,
   "m_merchantBubble": 94108
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/97.json b/data/json/MerchantInventoryDefinition/97.json
deleted file mode 100644
index 5cba705662a3e30a53f9f50e5e06e5ab2f9368ab..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/97.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "97",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 97,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 244
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 905
-            }
-          },
-          {
-            "k": 50.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 305
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [
-      21
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "CHAFER - Donjon 10",
-  "m_availability": 3,
-  "m_merchantBubble": 54943
-}
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/98.json b/data/json/MerchantInventoryDefinition/98.json
index ff8399f67dfd6d51ed7dbdf5752247bc3977a999..c3c6c6e9cc241a7620c9bd52d68b3f072e942668 100644
--- a/data/json/MerchantInventoryDefinition/98.json
+++ b/data/json/MerchantInventoryDefinition/98.json
@@ -7,75 +7,59 @@
     "defaultCostMultiplier": 1.0,
     "costMultiplierByObtainableItemType": [
       {
-        "k": 3,
+        "k": 5,
         "v": 1.0
       },
       {
-        "k": 5,
+        "k": 25,
+        "v": 1.0
+      },
+      {
+        "k": 32,
+        "v": 1.0
+      },
+      {
+        "k": 23,
         "v": 1.0
       },
       {
-        "k": 33,
+        "k": 52,
         "v": 1.0
       }
     ],
     "resetCost": [],
     "entries": [
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 611
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 611
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 789
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 789
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
             }
           },
           {
-            "k": 10.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 50.0,
-            "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 568
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
             }
           }
         ]
@@ -84,116 +68,63 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
-            "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "k": 10.0,
+            "k": 70.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 470
             }
           },
           {
-            "k": 50.0,
+            "k": 30.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 845
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 596
             }
           }
         ]
       },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 687
+      },
+      {
+        "type": "RefOwnableInfoListWithProfileSelector",
+        "referenceId": 687
+      },
       {
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 10.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 80.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 174
             }
           },
           {
-            "k": 50.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 188
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 690
             }
           }
         ]
@@ -202,57 +133,36 @@
         "type": "OwnableInfoListWithWeightSelector",
         "entries": [
           {
-            "k": 40.0,
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 470
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 740
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
           },
           {
-            "k": 10.0,
+            "k": 20.0,
+            "v": {
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
+            }
+          }
+        ]
+      },
+      {
+        "type": "OwnableInfoListWithWeightSelector",
+        "entries": [
+          {
+            "k": 80.0,
             "v": {
-              "type": "OwnableInfoListWithWeightSelector",
-              "entries": [
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 687
-                  }
-                },
-                {
-                  "k": 50.0,
-                  "v": {
-                    "type": "RefOwnableInfoListWithProfileSelector",
-                    "referenceId": 286
-                  }
-                }
-              ]
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 830
             }
           },
           {
-            "k": 50.0,
+            "k": 20.0,
             "v": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 745
-              }
+              "type": "RefOwnableInfoListWithProfileSelector",
+              "referenceId": 411
             }
           }
         ]
@@ -263,159 +173,23 @@
       "type": "OwnableInfoListWithWeightSelector",
       "entries": [
         {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
+          "k": 80.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 174
           }
         },
         {
           "k": 20.0,
           "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
+            "type": "RefOwnableInfoListWithProfileSelector",
+            "referenceId": 690
           }
         }
       ]
     }
   },
-  "m_displayName": "COCHON - Donjon 01",
+  "m_displayName": "COCHON - Donjon 01-10",
   "m_availability": 3,
   "m_merchantBubble": 37333
 }
\ No newline at end of file
diff --git a/data/json/MerchantInventoryDefinition/99.json b/data/json/MerchantInventoryDefinition/99.json
deleted file mode 100644
index 8c63fd0ee737e97d65ceeeb4c642da7cd80a5cf8..0000000000000000000000000000000000000000
--- a/data/json/MerchantInventoryDefinition/99.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "99",
-  "m_jsonRepresentation": {
-    "type": "MerchantInventoryDefinition",
-    "id": 99,
-    "defaultCostMultiplier": 1.0,
-    "costMultiplierByObtainableItemType": [
-      {
-        "k": 3,
-        "v": 1.0
-      },
-      {
-        "k": 5,
-        "v": 1.0
-      },
-      {
-        "k": 33,
-        "v": 1.0
-      }
-    ],
-    "resetCost": [],
-    "entries": [
-      {
-        "type": "OwnableInfoListWithWeightSelector",
-        "entries": [
-          {
-            "k": 30.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 470
-            }
-          },
-          {
-            "k": 20.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 687
-            }
-          },
-          {
-            "k": 50.0,
-            "v": {
-              "type": "RefOwnableInfoListWithProfileSelector",
-              "referenceId": 170
-            }
-          }
-        ]
-      }
-    ],
-    "subInventories": [
-      59
-    ],
-    "defaultEntrie": {
-      "type": "OwnableInfoListWithWeightSelector",
-      "entries": [
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 152
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 101
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 222
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 675
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 20.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 708
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 15,
-              "max": 15
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 179
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 232
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 286
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 261
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        },
-        {
-          "k": 5.0,
-          "v": {
-            "type": "OwnableItemInfo",
-            "ownableId": {
-              "typeEnum": 23,
-              "value": 742
-            },
-            "count": {
-              "type": "MinMax",
-              "min": 2,
-              "max": 2
-            }
-          }
-        }
-      ]
-    }
-  },
-  "m_displayName": "COCHON - Donjon 10",
-  "m_availability": 3,
-  "m_merchantBubble": 7069
-}
\ No newline at end of file
diff --git a/data/json/NamedEffectDefinition/20.json b/data/json/NamedEffectDefinition/20.json
index 17a25942d900eff231a7e305ce7ebdbd1c179e15..02c672b89f1cfa5516ef356c1371b052d1e8618b 100644
--- a/data/json/NamedEffectDefinition/20.json
+++ b/data/json/NamedEffectDefinition/20.json
@@ -8,7 +8,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
diff --git a/data/json/NamedEffectDefinition/245.json b/data/json/NamedEffectDefinition/245.json
index ae72027b8789502f8cfdcf4f4f276740515772e3..f7e1d4018cf30457d941c8b56e417e19770fde39 100644
--- a/data/json/NamedEffectDefinition/245.json
+++ b/data/json/NamedEffectDefinition/245.json
@@ -12,5 +12,5 @@
     }
   },
   "m_displayName": "CHAFER - SILVER - Rivière des Âmes",
-  "m_availability": 2
+  "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/1007.json b/data/json/ObjectMechanismDefinition/1007.json
index e7b313a410f40877085626f6803baf4629cffc67..3a3bc5c69c167bd717c705981aef41226ecf6b64 100644
--- a/data/json/ObjectMechanismDefinition/1007.json
+++ b/data/json/ObjectMechanismDefinition/1007.json
@@ -7,9 +7,9 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 7604,
     "skins": [
-      1
+      7604
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -18,27 +18,11 @@
           "type": "ConstIntegerValue",
           "referenceId": "re",
           "value": 1
-        },
-        {
-          "type": "NegativeValue",
-          "referenceId": "pa",
-          "valueToNeg": {
-            "type": "ConstIntegerValue",
-            "referenceId": "",
-            "value": 1
-          }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
+        "FROZEN",
         "MECHANISM"
       ]
     },
@@ -55,12 +39,12 @@
       "baseValue": 50.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
   "m_displayName": "XELOR - Xelocube Lunaire",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 88346,
   "m_i18nDescriptionId": 11357
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/1097.json b/data/json/ObjectMechanismDefinition/1097.json
index 5e0d25543bf8aa32dd1e675d88e00e7067336942..e9421f4e78c8cfb11a240a80c4a7dc2773cb864c 100644
--- a/data/json/ObjectMechanismDefinition/1097.json
+++ b/data/json/ObjectMechanismDefinition/1097.json
@@ -30,7 +30,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/1309.json b/data/json/ObjectMechanismDefinition/1309.json
index b34d4d0274acd7adc1f0161bfd5d1d3a91c6fbde..d78d741f24bd5f8878236afae61cf1e3f744187e 100644
--- a/data/json/ObjectMechanismDefinition/1309.json
+++ b/data/json/ObjectMechanismDefinition/1309.json
@@ -38,7 +38,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/1364.json b/data/json/ObjectMechanismDefinition/1364.json
index 83673e28ab724515a845b6f38919db0456382f17..be329a06bd8be4d98ab1806a80d5e859eed5897c 100644
--- a/data/json/ObjectMechanismDefinition/1364.json
+++ b/data/json/ObjectMechanismDefinition/1364.json
@@ -7,9 +7,9 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 3837,
     "skins": [
-      1
+      3837
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -21,8 +21,13 @@
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "perc",
-          "value": 25
+          "referenceId": "dmg",
+          "value": 10
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "bl",
+          "value": 10
         }
       ],
       "hasEffects": true,
@@ -44,12 +49,12 @@
       "baseValue": 50.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
   "m_displayName": "XELOR - Xelocube Volcanique",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 29337,
   "m_i18nDescriptionId": 95114
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/1447.json b/data/json/ObjectMechanismDefinition/1447.json
index cde6b747ada9bc30017b3a1c618cb05f5312dcf4..4f3cf8928b5f5959b60df7572cabb82d963a1cae 100644
--- a/data/json/ObjectMechanismDefinition/1447.json
+++ b/data/json/ObjectMechanismDefinition/1447.json
@@ -13,40 +13,13 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "ConstIntLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v",
-          "values": [
-            15,
-            17,
-            18,
-            20,
-            22,
-            24,
-            27,
-            30,
-            32,
-            36,
-            39,
-            43,
-            47,
-            52,
-            57,
-            63,
-            69,
-            76,
-            84,
-            92,
-            101,
-            111,
-            122,
-            135,
-            148,
-            163,
-            179,
-            197,
-            217,
-            238
-          ]
+          "baseValue": 15.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
         }
       ],
       "hasEffects": true,
@@ -64,7 +37,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 45.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/1486.json b/data/json/ObjectMechanismDefinition/1486.json
index 16fcc67a04933b4b488aa1e22e4bfce4b365d8c2..3f5259707d26b6c490b11ea2647a8f5b8ffb01a6 100644
--- a/data/json/ObjectMechanismDefinition/1486.json
+++ b/data/json/ObjectMechanismDefinition/1486.json
@@ -37,7 +37,7 @@
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/1554.json b/data/json/ObjectMechanismDefinition/1554.json
index 45f6563ddb6e7fcd7316f4b75ca1889fbdcee82e..c769f78affb5b064ab023f4fa5583fa18009c2ce 100644
--- a/data/json/ObjectMechanismDefinition/1554.json
+++ b/data/json/ObjectMechanismDefinition/1554.json
@@ -34,7 +34,7 @@
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/1607.json b/data/json/ObjectMechanismDefinition/1607.json
index f6d57f361ac91df77ab972024bd94fd3e0134200..f5deba211be2c995b2fc77e400aae01dc7fd5fed 100644
--- a/data/json/ObjectMechanismDefinition/1607.json
+++ b/data/json/ObjectMechanismDefinition/1607.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "AR",
           "baseValue": 8.0,
           "factor": {
@@ -35,7 +35,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/1653.json b/data/json/ObjectMechanismDefinition/1653.json
index e4aec6f0828e7c7f2baa4982267f17d190e75b43..1e85014f6359130faffd808f0e912b57d16ff5ee 100644
--- a/data/json/ObjectMechanismDefinition/1653.json
+++ b/data/json/ObjectMechanismDefinition/1653.json
@@ -36,7 +36,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/166.json b/data/json/ObjectMechanismDefinition/166.json
index d7aa000f96f93c20d9b87b27320b1f4fbfcc6d10..6180f45728f3a50295b212ca54ab12efb245cf80 100644
--- a/data/json/ObjectMechanismDefinition/166.json
+++ b/data/json/ObjectMechanismDefinition/166.json
@@ -13,7 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "MECHANISM"
+      ]
     },
     "families": [
       0
diff --git a/data/json/ObjectMechanismDefinition/1742.json b/data/json/ObjectMechanismDefinition/1742.json
index 4b2e0ac70b78282f12ab20252448bb2755e7e6f7..291e45fb3b95bad1ede7fabeb90808aa5ec0e6fa 100644
--- a/data/json/ObjectMechanismDefinition/1742.json
+++ b/data/json/ObjectMechanismDefinition/1742.json
@@ -29,7 +29,7 @@
     }
   },
   "m_displayName": "MONSTRE CHAFER - Tas d\u0027Os (Aligore)",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 46350,
   "m_i18nDescriptionId": 30655
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/1809.json b/data/json/ObjectMechanismDefinition/1809.json
index 832e44d01489905050ab87b1bfe725918b8cbbe4..3ec098620fecebd273cd31ea880d6a332e40ae83 100644
--- a/data/json/ObjectMechanismDefinition/1809.json
+++ b/data/json/ObjectMechanismDefinition/1809.json
@@ -35,7 +35,7 @@
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/1939.json b/data/json/ObjectMechanismDefinition/1939.json
index a153f30b1e42b95cb7b81615283abbda00ee56f6..75128e71a9fd72f6bfe50996daece8cb34076f01 100644
--- a/data/json/ObjectMechanismDefinition/1939.json
+++ b/data/json/ObjectMechanismDefinition/1939.json
@@ -25,7 +25,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/201.json b/data/json/ObjectMechanismDefinition/201.json
index 610b5df1befc4e7a58230dff9b0c0c9f11591bb2..f87af19d533c7d901ea632cf7a7cce5334cd145d 100644
--- a/data/json/ObjectMechanismDefinition/201.json
+++ b/data/json/ObjectMechanismDefinition/201.json
@@ -26,7 +26,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/22.json b/data/json/ObjectMechanismDefinition/22.json
index 50390aa6b64893e9abefb1edee833a65db7068c1..121b7c6fa19585d06d16cfbd0df8916aef35bb07 100644
--- a/data/json/ObjectMechanismDefinition/22.json
+++ b/data/json/ObjectMechanismDefinition/22.json
@@ -14,7 +14,6 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
         "CHIBIDIAL",
         "MECHANISM"
       ]
@@ -32,7 +31,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/23.json b/data/json/ObjectMechanismDefinition/23.json
index 254733e1b829e8259c93c405657691913384ab80..1bf1d94406e2fff05795997aad659c39e051cb88 100644
--- a/data/json/ObjectMechanismDefinition/23.json
+++ b/data/json/ObjectMechanismDefinition/23.json
@@ -29,7 +29,7 @@
     }
   },
   "m_displayName": "MONSTRE CHAFER - Tas d\u0027Os (Hochos)",
-  "m_availability": 2,
+  "m_availability": 3,
   "m_i18nNameId": 87610,
   "m_i18nDescriptionId": 42551
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/249.json b/data/json/ObjectMechanismDefinition/249.json
index 631d2e0bb0275137f511aabee5212faac7674881..3862ce12bdfe53a42c46be3bbea19a1979aa8933 100644
--- a/data/json/ObjectMechanismDefinition/249.json
+++ b/data/json/ObjectMechanismDefinition/249.json
@@ -13,21 +13,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 27.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 33.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -48,7 +48,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/39.json b/data/json/ObjectMechanismDefinition/39.json
index 798f797c67803b055a58d0ce5883b560e355ab2a..56f2abefe87a27d01873256e4326eb3be4bb922e 100644
--- a/data/json/ObjectMechanismDefinition/39.json
+++ b/data/json/ObjectMechanismDefinition/39.json
@@ -30,7 +30,7 @@
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/398.json b/data/json/ObjectMechanismDefinition/398.json
index 791c5dccd932c7d7f5ef0a4347c05f4999e52983..0325fa12a65a90b679deb577cea355ceaa27ca26 100644
--- a/data/json/ObjectMechanismDefinition/398.json
+++ b/data/json/ObjectMechanismDefinition/398.json
@@ -20,6 +20,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "MECHANISM"
       ]
     },
@@ -36,7 +37,7 @@
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/403.json b/data/json/ObjectMechanismDefinition/403.json
index 5992f480465bba46e72f8be71bd7cdbca6d3076b..3ee253ce67c7ec7b1762aaf95adaddb1ef986116 100644
--- a/data/json/ObjectMechanismDefinition/403.json
+++ b/data/json/ObjectMechanismDefinition/403.json
@@ -30,12 +30,12 @@
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
-  "m_displayName": "XELOR - Sinistro Neutre",
-  "m_availability": 0,
+  "m_displayName": "XELOR - Sinistro Astral",
+  "m_availability": 3,
   "m_i18nNameId": 1916,
   "m_i18nDescriptionId": 97174
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/429.json b/data/json/ObjectMechanismDefinition/429.json
index fb0e3ac0eeaf12f82707eaa0f2289f2eb98227f1..4ebd94ac4262eaaec137f3593c405af63a4acfde 100644
--- a/data/json/ObjectMechanismDefinition/429.json
+++ b/data/json/ObjectMechanismDefinition/429.json
@@ -36,7 +36,7 @@
       "baseValue": 50.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/439.json b/data/json/ObjectMechanismDefinition/439.json
index 3889522b8fedc692bbec5ca0473f7dab0da3de88..6da8ba3382180d805eec06f691c84de2666fe921 100644
--- a/data/json/ObjectMechanismDefinition/439.json
+++ b/data/json/ObjectMechanismDefinition/439.json
@@ -7,9 +7,9 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 3601,
     "skins": [
-      1
+      3601
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -21,13 +21,12 @@
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "perc",
-          "value": 50
+          "referenceId": "dmg",
+          "value": 10
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "LIGHTNING",
         "MECHANISM"
       ]
     },
@@ -44,12 +43,12 @@
       "baseValue": 50.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
   "m_displayName": "XELOR - Xelocube Solaire",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 44250,
   "m_i18nDescriptionId": 88712
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/451.json b/data/json/ObjectMechanismDefinition/451.json
index 364e8678d8cdb3b3aad9a4706c72c1d4875a1198..fd4bd9c2c116fde3b03cdf62ccdaff5707ebe3a6 100644
--- a/data/json/ObjectMechanismDefinition/451.json
+++ b/data/json/ObjectMechanismDefinition/451.json
@@ -17,12 +17,16 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 2
+          "value": 10
         },
         {
-          "type": "ConstIntegerValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "hp",
-          "value": 10
+          "baseValue": 10.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
         }
       ],
       "hasEffects": true,
@@ -38,7 +42,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/559.json b/data/json/ObjectMechanismDefinition/559.json
index 20e05fd465efa5fd760cfe40d337f8ddd3b834e0..f1eefb7754509f434c16bd48fed25cfcf0c67bf7 100644
--- a/data/json/ObjectMechanismDefinition/559.json
+++ b/data/json/ObjectMechanismDefinition/559.json
@@ -36,7 +36,7 @@
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/583.json b/data/json/ObjectMechanismDefinition/583.json
index a4a34f955927897c5dab6957118095a958bd16eb..5a38c6202b440ffc61f760281ab099adeca1b285 100644
--- a/data/json/ObjectMechanismDefinition/583.json
+++ b/data/json/ObjectMechanismDefinition/583.json
@@ -31,7 +31,7 @@
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/732.json b/data/json/ObjectMechanismDefinition/732.json
index c32a59518eea0e12c451c952a089730ed0fb457c..70112e662a0fc5617113569ac12611d74980e62c 100644
--- a/data/json/ObjectMechanismDefinition/732.json
+++ b/data/json/ObjectMechanismDefinition/732.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 8.0,
           "factor": {
@@ -33,7 +33,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
diff --git a/data/json/ObjectMechanismDefinition/766.json b/data/json/ObjectMechanismDefinition/766.json
index c49a4f2b2fe34bcd17e47cb1a160d1abb7a87259..2821f274dcd8af7b302c355a963d3ebf72aee432 100644
--- a/data/json/ObjectMechanismDefinition/766.json
+++ b/data/json/ObjectMechanismDefinition/766.json
@@ -39,7 +39,7 @@
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/807.json b/data/json/ObjectMechanismDefinition/807.json
index dd55a54b2bbc888c3f33e74389d9ecf3bc2d86be..0483cffdb27f60498ec144c2aaf05aeed9c9fc99 100644
--- a/data/json/ObjectMechanismDefinition/807.json
+++ b/data/json/ObjectMechanismDefinition/807.json
@@ -41,7 +41,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/903.json b/data/json/ObjectMechanismDefinition/903.json
index c114d013971bf47b9bd75a5b9504537bf2cbcfd5..bf49ff5aea39c2c7d4795d8abc82b868b9f1b6fd 100644
--- a/data/json/ObjectMechanismDefinition/903.json
+++ b/data/json/ObjectMechanismDefinition/903.json
@@ -7,9 +7,9 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 3839,
     "skins": [
-      1
+      3839
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -18,24 +18,10 @@
           "type": "ConstIntegerValue",
           "referenceId": "re",
           "value": 1
-        },
-        {
-          "type": "NegativeValue",
-          "referenceId": "pa",
-          "valueToNeg": {
-            "type": "ConstIntegerValue",
-            "referenceId": "",
-            "value": 1
-          }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
         "MECHANISM"
       ]
     },
@@ -52,12 +38,12 @@
       "baseValue": 50.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
   "m_displayName": "XELOR - Xelocube Vide",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 12563,
   "m_i18nDescriptionId": 45503
 }
\ No newline at end of file
diff --git a/data/json/ObjectMechanismDefinition/914.json b/data/json/ObjectMechanismDefinition/914.json
index 4f915d9fcdf28a1a65f02638e3ed58dda7c1c047..304aada903f27bff038d64e77f091baf5c2d9dff 100644
--- a/data/json/ObjectMechanismDefinition/914.json
+++ b/data/json/ObjectMechanismDefinition/914.json
@@ -34,7 +34,7 @@
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/955.json b/data/json/ObjectMechanismDefinition/955.json
index 47c9bfd230d84d3a9bd5dda09ac610179139ab81..2201b9b25968b001bfef7ebb06911f8582660822 100644
--- a/data/json/ObjectMechanismDefinition/955.json
+++ b/data/json/ObjectMechanismDefinition/955.json
@@ -37,7 +37,7 @@
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 4
+        "reference": 10
       }
     }
   },
diff --git a/data/json/ObjectMechanismDefinition/964.json b/data/json/ObjectMechanismDefinition/964.json
index 8bc29bfff526483d4ad3817b56a07fd004d0ee49..ddcc8e08c85dfa50eede477abfab2eb21b95e181 100644
--- a/data/json/ObjectMechanismDefinition/964.json
+++ b/data/json/ObjectMechanismDefinition/964.json
@@ -24,7 +24,7 @@
     },
     "spells": [],
     "baseMecaLife": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 28.0,
       "factor": {
diff --git a/data/json/ParameterizedEffectExecutionDefinition/11.json b/data/json/ParameterizedEffectExecutionDefinition/11.json
index 7729bd88de1356f11478d9dc5d985457ac17d6e8..8d746f93162947639dc754ab69cf0816b92c9b72 100644
--- a/data/json/ParameterizedEffectExecutionDefinition/11.json
+++ b/data/json/ParameterizedEffectExecutionDefinition/11.json
@@ -25,6 +25,6 @@
       "keywordReferences": []
     }
   },
-  "m_displayName": "Lightning Effect Execution",
+  "m_displayName": "Lightning Effect Execution (physical power)",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/ParameterizedEffectExecutionDefinition/314.json b/data/json/ParameterizedEffectExecutionDefinition/314.json
index 24aadf5a1227224e65c09c7f7e9d6e7b6e224a78..ca9a0381fdd08070cb4ae2c2700cb842c10caa70 100644
--- a/data/json/ParameterizedEffectExecutionDefinition/314.json
+++ b/data/json/ParameterizedEffectExecutionDefinition/314.json
@@ -25,6 +25,6 @@
       "keywordReferences": []
     }
   },
-  "m_displayName": "Shadow Effect Execution",
+  "m_displayName": "Shadow Effect Execution (magic power)",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/ParameterizedEffectExecutionDefinition/409.json b/data/json/ParameterizedEffectExecutionDefinition/409.json
index 04c8b8425426e0a5794094b85d6f30934688e613..634324d550dad82703d20cff00894b7a61d3d898 100644
--- a/data/json/ParameterizedEffectExecutionDefinition/409.json
+++ b/data/json/ParameterizedEffectExecutionDefinition/409.json
@@ -25,6 +25,6 @@
       "keywordReferences": []
     }
   },
-  "m_displayName": "Meteor Effect Execution",
+  "m_displayName": "Meteor Effect Execution (physical power)",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/ParameterizedEffectExecutionDefinition/756.json b/data/json/ParameterizedEffectExecutionDefinition/756.json
index c1443a2f22dee5254a0591e428c762b342e33934..637bbf5cdf91fc8fb6e875cf3afb5416c17da8e1 100644
--- a/data/json/ParameterizedEffectExecutionDefinition/756.json
+++ b/data/json/ParameterizedEffectExecutionDefinition/756.json
@@ -25,6 +25,6 @@
       "keywordReferences": []
     }
   },
-  "m_displayName": "Wave Effect Execution",
+  "m_displayName": "Wave Effect Execution (magic power)",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/ParameterizedEffectExecutionDefinition/782.json b/data/json/ParameterizedEffectExecutionDefinition/782.json
index d4d14fd2a305b0c1d4e1d359e27bfb68eec80725..56a08ea760aa51c314c9272023c925d4bb94b348 100644
--- a/data/json/ParameterizedEffectExecutionDefinition/782.json
+++ b/data/json/ParameterizedEffectExecutionDefinition/782.json
@@ -25,6 +25,6 @@
       "keywordReferences": []
     }
   },
-  "m_displayName": "Rebound Effect Execution (no magic power)",
+  "m_displayName": "Rebound Effect Execution (no buff)",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/PropertyCustomEffectDefinition/16.json b/data/json/PropertyCustomEffectDefinition/16.json
index 7f4b6928fdc651d7fda05a99a9c945543c0f7a8d..3eeab792d5bdbc122fcd52c1f78069b0bbf9cd79 100644
--- a/data/json/PropertyCustomEffectDefinition/16.json
+++ b/data/json/PropertyCustomEffectDefinition/16.json
@@ -8,12 +8,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ElecDmg",
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/PropertyCustomEffectDefinition/51.json b/data/json/PropertyCustomEffectDefinition/51.json
index 6331e4b62fa7738c37a0ba3ea45fc708c28659a5..30890da53ae928234898985e5f0a12be8d87bc6f 100644
--- a/data/json/PropertyCustomEffectDefinition/51.json
+++ b/data/json/PropertyCustomEffectDefinition/51.json
@@ -8,13 +8,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "OffStanceAT",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 40
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/QuestDefinition/30.json b/data/json/QuestDefinition/30.json
index 2b782a706c74df16c5caa815ca1d27f29fbfe7d5..1cdf2382c8deb8a3ae1dcfecbff5ceafdb0c5c1b 100644
--- a/data/json/QuestDefinition/30.json
+++ b/data/json/QuestDefinition/30.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 30,
-    "relatedFamily": 49,
+    "chaptersVisualId": 49,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -12,49 +12,63 @@
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
-        "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "i18nDescriptionId": 3288,
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 34606,
-        "startsAtChapter": 11,
-        "rules": [
-          121,
-          263
-        ]
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 44943,
-        "startsAtChapter": 21,
-        "rules": [
-          40,
-          55
-        ]
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 85579,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 54705,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 1,
+        "fightDifficulty": 2,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 244
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 100,
-                "max": 100
+                "min": 120,
+                "max": 120
               }
             }
           },
@@ -69,30 +83,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -100,27 +108,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 2,
+        "fightDifficulty": 4,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 74
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 120,
-                "max": 120
+                "min": 140,
+                "max": 140
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -129,30 +148,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 244
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -160,27 +173,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 3,
+        "fightDifficulty": 6,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 593
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 140,
-                "max": 140
+                "min": 160,
+                "max": 160
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -189,30 +213,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "min": 6,
+                "max": 6
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -220,27 +238,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 4,
+        "fightDifficulty": 8,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 434
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 160,
-                "max": 160
+                "min": 180,
+                "max": 180
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -249,30 +278,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "min": 6,
+                "max": 6
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -280,59 +303,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 5,
+        "fightDifficulty": 10,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 180,
-                "max": 180
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 256
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 708
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 200,
+                "max": 200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -340,59 +368,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 6,
-        "fightDifficulty": 6,
+        "fightDifficulty": 12,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 200,
-                "max": 200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 68278
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 708
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 220,
+                "max": 220
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -400,59 +433,1364 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 6,
-        "fightDifficulty": 7,
+        "fightDifficulty": 14,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 516
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 220,
-                "max": 220
+                "min": 240,
+                "max": 240
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 7,
+        "i18nDescriptionId": 0,
+        "duration": 8,
+        "fightDifficulty": 16,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70245
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 260,
+                "max": 260
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 8,
+        "i18nDescriptionId": 0,
+        "duration": 8,
+        "fightDifficulty": 18,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 167
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 280,
+                "max": 280
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 9,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 20,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67386
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 300,
+                "max": 300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 10,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 22,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 244
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 320,
+                "max": 320
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 7,
+                "max": 7
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 11,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 24,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 74
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 340,
+                "max": 340
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 7,
+                "max": 7
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 12,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 26,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 593
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 360,
+                "max": 360
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 8,
+                "max": 8
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 13,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 28,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 434
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 380,
+                "max": 380
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 8,
+                "max": 8
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 14,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 30,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 256
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 400,
+                "max": 400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 15,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 32,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 68278
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 420,
+                "max": 420
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 16,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 34,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 516
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 440,
+                "max": 440
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 17,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 36,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70245
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 460,
+                "max": 460
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 18,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 38,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 167
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 480,
+                "max": 480
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 19,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 40,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67386
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 500,
+                "max": 500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 20,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 42,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 807
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 520,
+                "max": 520
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 21,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 44,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 74
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 540,
+                "max": 540
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 22,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 46,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 728
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 560,
+                "max": 560
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 23,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 48,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 434
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 580,
+                "max": 580
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 24,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 50,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 52
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 600,
+                "max": 600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 25,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 52,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 68278
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 620,
+                "max": 620
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 26,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 54,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 237
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 640,
+                "max": 640
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 708
+                "value": 742
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 7.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "min": 3,
+                "max": 3
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -460,59 +1798,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 27,
         "i18nDescriptionId": 0,
-        "duration": 8,
-        "fightDifficulty": 8,
+        "duration": 10,
+        "fightDifficulty": 56,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 240,
-                "max": 240
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70245
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 708
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 660,
+                "max": 660
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "typeEnum": 23,
+                "value": 742
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -520,59 +1863,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 28,
         "i18nDescriptionId": 0,
-        "duration": 8,
-        "fightDifficulty": 9,
+        "duration": 10,
+        "fightDifficulty": 58,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 260,
-                "max": 260
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 805
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 708
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 680,
+                "max": 680
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -580,11 +1928,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 29,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 10,
+        "fightDifficulty": 60,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67386
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -593,46 +1952,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 280,
-                "max": 280
+                "min": 700,
+                "max": 700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 708
+                "value": 419
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 10.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 244
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 127
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -640,59 +1993,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 11,
+        "chapterIndex": 30,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 11,
+        "fightDifficulty": 63,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 300,
-                "max": 300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 807
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 742
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 720,
+                "max": 720
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 12,
+                "max": 12
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -700,59 +2058,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 12,
+        "chapterIndex": 31,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 12,
+        "fightDifficulty": 66,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 320,
-                "max": 320
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 74
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 742
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 740,
+                "max": 740
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 13,
+                "max": 13
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -760,59 +2123,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 13,
+        "chapterIndex": 32,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 13,
+        "fightDifficulty": 69,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 340,
-                "max": 340
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 728
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 742
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 760,
+                "max": 760
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 14,
+                "max": 14
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -820,59 +2188,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 14,
+        "chapterIndex": 33,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 14,
+        "fightDifficulty": 72,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 360,
-                "max": 360
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 434
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 742
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 780,
+                "max": 780
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -880,27 +2253,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 15,
+        "chapterIndex": 34,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 15,
+        "fightDifficulty": 75,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 52
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 380,
-                "max": 380
+                "min": 800,
+                "max": 800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -909,30 +2293,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -940,27 +2318,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 16,
+        "chapterIndex": 35,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 16,
+        "fightDifficulty": 78,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 68278
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 400,
-                "max": 400
+                "min": 820,
+                "max": 820
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -969,30 +2358,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1000,27 +2383,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 17,
+        "chapterIndex": 36,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 17,
+        "fightDifficulty": 81,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 237
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 420,
-                "max": 420
+                "min": 840,
+                "max": 840
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1029,30 +2423,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1060,27 +2448,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 18,
+        "chapterIndex": 37,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 18,
+        "fightDifficulty": 84,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70245
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 440,
-                "max": 440
+                "min": 860,
+                "max": 860
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1089,30 +2488,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 256
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1120,59 +2513,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 19,
+        "chapterIndex": 38,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 19,
+        "fightDifficulty": 87,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 460,
-                "max": 460
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 805
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 742
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 880,
+                "max": 880
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1180,59 +2578,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 20,
+        "chapterIndex": 39,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 20,
+        "fightDifficulty": 90,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 480,
-                "max": 480
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67386
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 742
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 900,
+                "max": 900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 256
+                "typeEnum": 23,
+                "value": 419
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 253
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1240,11 +2643,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 21,
+        "chapterIndex": 40,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 21,
+        "fightDifficulty": 94,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 807
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1253,46 +2667,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 500,
-                "max": 500
+                "min": 920,
+                "max": 920
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 708
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 0.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 16,
+                "max": 16
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1300,59 +2708,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 22,
+        "chapterIndex": 41,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 22,
+        "fightDifficulty": 98,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 520,
-                "max": 520
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 74
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 50.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 419
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
+                "min": 940,
+                "max": 940
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "typeEnum": 23,
+                "value": 708
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 17,
+                "max": 17
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1360,11 +2773,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 23,
+        "chapterIndex": 42,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 23,
+        "fightDifficulty": 102,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 728
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1373,46 +2797,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 540,
-                "max": 540
+                "min": 960,
+                "max": 960
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 708
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 18,
+                "max": 18
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1420,11 +2838,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 24,
+        "chapterIndex": 43,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 24,
+        "fightDifficulty": 106,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 434
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1433,46 +2862,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 560,
-                "max": 560
+                "min": 980,
+                "max": 980
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 708
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1480,11 +2903,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 25,
+        "chapterIndex": 44,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 25,
+        "fightDifficulty": 110,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 52
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1493,46 +2927,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 580,
-                "max": 580
+                "min": 1000,
+                "max": 1000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 742
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1540,11 +2968,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 26,
+        "chapterIndex": 45,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 26,
+        "fightDifficulty": 114,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 68278
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1553,8 +2992,8 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 600,
-                "max": 600
+                "min": 1020,
+                "max": 1020
               }
             }
           },
@@ -1565,34 +3004,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 742
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1600,11 +3033,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 27,
+        "chapterIndex": 46,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 27,
+        "fightDifficulty": 118,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 237
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1613,46 +3057,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 620,
-                "max": 620
+                "min": 1040,
+                "max": 1040
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 742
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1660,11 +3098,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 28,
+        "chapterIndex": 47,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 28,
+        "fightDifficulty": 122,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70245
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1673,46 +3122,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 640,
-                "max": 640
+                "min": 1060,
+                "max": 1060
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 419
+                "value": 742
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1720,11 +3163,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 29,
+        "chapterIndex": 48,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 29,
+        "fightDifficulty": 126,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 805
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1733,14 +3187,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 660,
-                "max": 660
+                "min": 1080,
+                "max": 1080
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1756,23 +3210,17 @@
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1780,11 +3228,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 30,
+        "chapterIndex": 49,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 30,
+        "fightDifficulty": 130,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 67386
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1793,14 +3252,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 680,
-                "max": 680
+                "min": 1100,
+                "max": 1100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1816,23 +3275,17 @@
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 915
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 768
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1840,7 +3293,7 @@
       }
     ]
   },
-  "m_displayName": "BWORK - Baston Générale",
+  "m_displayName": "BWORK - Q1 Baston Générale",
   "m_availability": 3,
   "m_i18nNameId": 287
 }
\ No newline at end of file
diff --git a/data/json/QuestDefinition/32.json b/data/json/QuestDefinition/32.json
index 293e5881c9f414dc09bf724e617ffc91cbfab326..5f08ea6452a5612b681b25ec29d28b6f4adbd80e 100644
--- a/data/json/QuestDefinition/32.json
+++ b/data/json/QuestDefinition/32.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 32,
-    "relatedFamily": 40,
+    "chaptersVisualId": 40,
     "minPlayers": 1,
     "maxPlayers": 3,
     "accessCondition": {
@@ -18,28 +18,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -47,7 +56,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 2,
@@ -55,7 +64,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -63,7 +72,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 4,
@@ -71,7 +80,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 5,
@@ -79,7 +88,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 6,
@@ -87,7 +96,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 7,
@@ -95,7 +104,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 8,
@@ -103,7 +112,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 9,
@@ -111,7 +120,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/40.json b/data/json/QuestDefinition/40.json
index 09785309f372c0eed3ef66b6e02878c08c2e43a6..dcfeae616ac7b3f630f6271d829989c27ce2ec8e 100644
--- a/data/json/QuestDefinition/40.json
+++ b/data/json/QuestDefinition/40.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 40,
-    "relatedFamily": 50,
+    "chaptersVisualId": 50,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -12,48 +12,63 @@
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
-        "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "i18nDescriptionId": 21517,
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 65243,
-        "startsAtChapter": 11,
-        "rules": [
-          183
-        ]
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 98745,
-        "startsAtChapter": 21,
-        "rules": [
-          120,
-          870
-        ]
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 39207,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 18489,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 1,
+        "fightDifficulty": 2,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 555
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 100,
-                "max": 100
+                "min": 120,
+                "max": 120
               }
             }
           },
@@ -68,30 +83,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -99,27 +108,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 2,
+        "fightDifficulty": 4,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 748
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 120,
-                "max": 120
+                "min": 140,
+                "max": 140
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -128,30 +148,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 555
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -159,27 +173,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 3,
+        "fightDifficulty": 6,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 482
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 140,
-                "max": 140
+                "min": 160,
+                "max": 160
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -188,30 +213,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "min": 6,
+                "max": 6
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -219,27 +238,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 4,
+        "fightDifficulty": 8,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 37
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 160,
-                "max": 160
+                "min": 180,
+                "max": 180
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -248,30 +278,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "min": 6,
+                "max": 6
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -279,59 +303,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 7,
-        "fightDifficulty": 5,
+        "fightDifficulty": 10,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 180,
-                "max": 180
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 191
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 200,
+                "max": 200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -339,59 +368,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 7,
-        "fightDifficulty": 6,
+        "fightDifficulty": 12,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 200,
-                "max": 200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69119
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 220,
+                "max": 220
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -399,59 +433,1364 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 8,
-        "fightDifficulty": 7,
+        "fightDifficulty": 14,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 220,
-                "max": 220
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 185
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 240,
+                "max": 240
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 7,
+        "i18nDescriptionId": 0,
+        "duration": 8,
+        "fightDifficulty": 16,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 66833
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 260,
+                "max": 260
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 8,
+        "i18nDescriptionId": 0,
+        "duration": 8,
+        "fightDifficulty": 18,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 785
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 280,
+                "max": 280
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 9,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 20,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 657
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 300,
+                "max": 300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 10,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 22,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 555
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 320,
+                "max": 320
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 7,
+                "max": 7
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 11,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 24,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 748
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 340,
+                "max": 340
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 7,
+                "max": 7
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 12,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 26,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 482
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 360,
+                "max": 360
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 8,
+                "max": 8
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 13,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 28,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 37
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 380,
+                "max": 380
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 8,
+                "max": 8
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 14,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 30,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 191
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 400,
+                "max": 400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 15,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 32,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69119
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 420,
+                "max": 420
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 16,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 34,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 185
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 440,
+                "max": 440
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 17,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 36,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 66833
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 460,
+                "max": 460
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 18,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 38,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 785
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 480,
+                "max": 480
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 19,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 40,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 657
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 500,
+                "max": 500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 20,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 42,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 633
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 520,
+                "max": 520
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 21,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 44,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 748
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 540,
+                "max": 540
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 22,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 46,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 743
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 560,
+                "max": 560
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 23,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 48,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 37
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 580,
+                "max": 580
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
                 "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 24,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 50,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 72
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 600,
+                "max": 600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 25,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 52,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69119
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 620,
+                "max": 620
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 26,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 54,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 884
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 640,
+                "max": 640
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -459,59 +1798,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 27,
         "i18nDescriptionId": 0,
-        "duration": 8,
-        "fightDifficulty": 8,
+        "duration": 10,
+        "fightDifficulty": 56,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 240,
-                "max": 240
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 66833
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 660,
+                "max": 660
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -519,59 +1863,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 28,
         "i18nDescriptionId": 0,
-        "duration": 8,
-        "fightDifficulty": 9,
+        "duration": 10,
+        "fightDifficulty": 58,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 260,
-                "max": 260
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 563
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 680,
+                "max": 680
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -579,59 +1928,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 29,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 10,
+        "fightDifficulty": 60,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 280,
-                "max": 280
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 657
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 700,
+                "max": 700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 555
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 5
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -639,59 +1993,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 11,
+        "chapterIndex": 30,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 11,
+        "fightDifficulty": 63,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 300,
-                "max": 300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 633
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 720,
+                "max": 720
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 12,
+                "max": 12
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -699,59 +2058,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 12,
+        "chapterIndex": 31,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 12,
+        "fightDifficulty": 66,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 320,
-                "max": 320
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 748
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 740,
+                "max": 740
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 13,
+                "max": 13
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -759,59 +2123,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 13,
+        "chapterIndex": 32,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 13,
+        "fightDifficulty": 69,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 340,
-                "max": 340
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 743
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 760,
+                "max": 760
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 14,
+                "max": 14
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -819,59 +2188,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 14,
+        "chapterIndex": 33,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 14,
+        "fightDifficulty": 72,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 360,
-                "max": 360
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 37
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 780,
+                "max": 780
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -879,27 +2253,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 15,
+        "chapterIndex": 34,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 15,
+        "fightDifficulty": 75,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 72
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 380,
-                "max": 380
+                "min": 800,
+                "max": 800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -908,30 +2293,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -939,27 +2318,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 16,
+        "chapterIndex": 35,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 16,
+        "fightDifficulty": 78,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69119
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 400,
-                "max": 400
+                "min": 820,
+                "max": 820
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -968,30 +2358,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -999,27 +2383,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 17,
+        "chapterIndex": 36,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 17,
+        "fightDifficulty": 81,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 884
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 420,
-                "max": 420
+                "min": 840,
+                "max": 840
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1028,30 +2423,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1059,27 +2448,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 18,
+        "chapterIndex": 37,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 18,
+        "fightDifficulty": 84,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 66833
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 440,
-                "max": 440
+                "min": 860,
+                "max": 860
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1088,30 +2488,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 191
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1119,59 +2513,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 19,
+        "chapterIndex": 38,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 19,
+        "fightDifficulty": 87,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 460,
-                "max": 460
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 563
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 880,
+                "max": 880
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1179,59 +2578,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 20,
+        "chapterIndex": 39,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 20,
+        "fightDifficulty": 90,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 480,
-                "max": 480
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 657
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 900,
+                "max": 900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 191
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 145
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1239,11 +2643,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 21,
+        "chapterIndex": 40,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 21,
+        "fightDifficulty": 94,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 633
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1252,46 +2667,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 500,
-                "max": 500
+                "min": 920,
+                "max": 920
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 0.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 16,
+                "max": 16
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1299,59 +2708,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 22,
+        "chapterIndex": 41,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 22,
+        "fightDifficulty": 98,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 520,
-                "max": 520
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 748
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 50.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 873
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
+                "min": 940,
+                "max": 940
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 17,
+                "max": 17
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1359,11 +2773,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 23,
+        "chapterIndex": 42,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 23,
+        "fightDifficulty": 102,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 743
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1372,46 +2797,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 540,
-                "max": 540
+                "min": 960,
+                "max": 960
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 18,
+                "max": 18
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1419,11 +2838,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 24,
+        "chapterIndex": 43,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 24,
+        "fightDifficulty": 106,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 37
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1432,46 +2862,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 560,
-                "max": 560
+                "min": 980,
+                "max": 980
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1479,11 +2903,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 25,
+        "chapterIndex": 44,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 25,
+        "fightDifficulty": 110,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 72
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1492,46 +2927,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 580,
-                "max": 580
+                "min": 1000,
+                "max": 1000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1539,11 +2968,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 26,
+        "chapterIndex": 45,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 26,
+        "fightDifficulty": 114,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 69119
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1552,8 +2992,8 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 600,
-                "max": 600
+                "min": 1020,
+                "max": 1020
               }
             }
           },
@@ -1564,34 +3004,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1599,11 +3033,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 27,
+        "chapterIndex": 46,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 27,
+        "fightDifficulty": 118,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 884
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1612,46 +3057,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 620,
-                "max": 620
+                "min": 1040,
+                "max": 1040
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1659,11 +3098,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 28,
+        "chapterIndex": 47,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 28,
+        "fightDifficulty": 122,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 66833
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1672,46 +3122,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 640,
-                "max": 640
+                "min": 1060,
+                "max": 1060
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1719,11 +3163,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 29,
+        "chapterIndex": 48,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 29,
+        "fightDifficulty": 126,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 563
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1732,14 +3187,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 660,
-                "max": 660
+                "min": 1080,
+                "max": 1080
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1755,23 +3210,17 @@
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1779,11 +3228,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 30,
+        "chapterIndex": 49,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 30,
+        "fightDifficulty": 130,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 657
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1792,14 +3252,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 680,
-                "max": 680
+                "min": 1100,
+                "max": 1100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1815,23 +3275,17 @@
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 405
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 248
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1839,7 +3293,7 @@
       }
     ]
   },
-  "m_displayName": "QUETE COCHON - Gruik !",
+  "m_displayName": "QUETE COCHON - Q1 Gruik !",
   "m_availability": 3,
   "m_i18nNameId": 97248
 }
\ No newline at end of file
diff --git a/data/json/QuestDefinition/44.json b/data/json/QuestDefinition/44.json
index 499d710ddce67e61eafae5de5a20cf9150dd360a..e4d34b81603f1e9e085ffeef8577b8b63fe22c8b 100644
--- a/data/json/QuestDefinition/44.json
+++ b/data/json/QuestDefinition/44.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 44,
-    "relatedFamily": 36,
+    "chaptersVisualId": 36,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/47.json b/data/json/QuestDefinition/47.json
index 4691e846465d007b5b1f72a460c22558da5b9504..c193d1b74f14638908bc65e4b3c2f3716696f290 100644
--- a/data/json/QuestDefinition/47.json
+++ b/data/json/QuestDefinition/47.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 47,
-    "relatedFamily": 52,
+    "chaptersVisualId": 52,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/49.json b/data/json/QuestDefinition/49.json
index 56d5d8009cbaf913ab7578f0cf0c636ea902e063..6d98cae505ff31e633e4bb5812022718538a038d 100644
--- a/data/json/QuestDefinition/49.json
+++ b/data/json/QuestDefinition/49.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 49,
-    "relatedFamily": 52,
+    "chaptersVisualId": 52,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
diff --git a/data/json/QuestDefinition/5.json b/data/json/QuestDefinition/5.json
index 1f7bc24d049b3146a0a516c59e7ced6a1ad620a3..84b48f1b4c6682c627b5dec18534fcfae9c50e95 100644
--- a/data/json/QuestDefinition/5.json
+++ b/data/json/QuestDefinition/5.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 5,
-    "relatedFamily": 50,
+    "chaptersVisualId": 50,
     "minPlayers": 1,
     "maxPlayers": 3,
     "accessCondition": {
@@ -18,28 +18,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -47,7 +56,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -55,7 +64,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -63,7 +72,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -71,7 +80,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -79,7 +88,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -87,7 +96,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -95,7 +104,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -103,7 +112,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -111,7 +120,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
diff --git a/data/json/QuestDefinition/55.json b/data/json/QuestDefinition/55.json
index 53d357bfc0493e34d7bcfbc5fa48b3be7370a87e..77612c7cd84b64a545169041168629d11afabedb 100644
--- a/data/json/QuestDefinition/55.json
+++ b/data/json/QuestDefinition/55.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 55,
-    "relatedFamily": 0,
+    "chaptersVisualId": 170,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
diff --git a/data/json/QuestDefinition/6.json b/data/json/QuestDefinition/6.json
index ee28a1c7cfb46e8748538b1c870c4fe656ce54e2..eb782635823afe319e881d5313cfbc6c7c1db7cf 100644
--- a/data/json/QuestDefinition/6.json
+++ b/data/json/QuestDefinition/6.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 6,
-    "relatedFamily": 49,
+    "chaptersVisualId": 49,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/68.json b/data/json/QuestDefinition/68.json
index 3b08c0899322c44ec790b4807e0105223e860dcf..fc397bfd9083de09441822599f2059fca39e7873 100644
--- a/data/json/QuestDefinition/68.json
+++ b/data/json/QuestDefinition/68.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 68,
-    "relatedFamily": 37,
+    "chaptersVisualId": 37,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/7.json b/data/json/QuestDefinition/7.json
index 5d2fc265475aca351b0d1ac27a16722f7b4f93a8..43c1ff9acd29803df7d9926d3504beab7a6e059e 100644
--- a/data/json/QuestDefinition/7.json
+++ b/data/json/QuestDefinition/7.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 7,
-    "relatedFamily": 36,
+    "chaptersVisualId": 36,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 4,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 4,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 6,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 6,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 7,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 7,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/70.json b/data/json/QuestDefinition/70.json
index 0e6423b2d42c23489d931d69804d14f7f1818e9e..b2295efbb72a79271eeec479604e0b2f26b8c70c 100644
--- a/data/json/QuestDefinition/70.json
+++ b/data/json/QuestDefinition/70.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 70,
-    "relatedFamily": 41,
+    "chaptersVisualId": 41,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 4,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 4,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 5,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 6,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 6,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 7,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 7,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/78.json b/data/json/QuestDefinition/78.json
index 12b6c5d880d1d7813aace02fd419d19ede002cfe..477270ace7930ab129976757147c8175f0c37bef 100644
--- a/data/json/QuestDefinition/78.json
+++ b/data/json/QuestDefinition/78.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 78,
-    "relatedFamily": 56,
+    "chaptersVisualId": 174,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -42,7 +51,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 2,
@@ -50,7 +59,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 3,
@@ -58,7 +67,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 4,
@@ -66,7 +75,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 5,
@@ -74,7 +83,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 6,
@@ -82,7 +91,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 7,
@@ -90,7 +99,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 8,
@@ -98,7 +107,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 9,
@@ -106,7 +115,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 10,
diff --git a/data/json/QuestDefinition/8.json b/data/json/QuestDefinition/8.json
index 257de147cb1e6211777b237dcd195a718753e65c..c6b5951859afa400ac2d4449b6a57e4d69bf5379 100644
--- a/data/json/QuestDefinition/8.json
+++ b/data/json/QuestDefinition/8.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 8,
-    "relatedFamily": 40,
+    "chaptersVisualId": 40,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -12,48 +12,63 @@
       "bronze": {
         "type": "AdventureRankInfo",
         "rank": 0,
-        "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "i18nDescriptionId": 90260,
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 37720,
-        "startsAtChapter": 11,
-        "rules": [
-          673
-        ]
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 88411,
-        "startsAtChapter": 21,
-        "rules": [
-          432,
-          128
-        ]
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 38384,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 72602,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 1,
+        "fightDifficulty": 2,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 815
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 100,
-                "max": 100
+                "min": 120,
+                "max": 120
               }
             }
           },
@@ -68,30 +83,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -99,27 +108,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 2,
+        "fightDifficulty": 4,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 579
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 120,
-                "max": 120
+                "min": 140,
+                "max": 140
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -128,30 +148,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 815
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -159,27 +173,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 3,
+        "fightDifficulty": 6,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 822
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 140,
-                "max": 140
+                "min": 160,
+                "max": 160
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -188,30 +213,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "min": 6,
+                "max": 6
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -219,27 +238,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 4,
+        "fightDifficulty": 8,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70744
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 160,
-                "max": 160
+                "min": 180,
+                "max": 180
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -248,30 +278,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "min": 6,
+                "max": 6
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -279,59 +303,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 5,
-        "fightDifficulty": 5,
+        "fightDifficulty": 10,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 180,
-                "max": 180
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 946
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 200,
+                "max": 200
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -339,59 +368,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 6,
-        "fightDifficulty": 6,
+        "fightDifficulty": 12,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 1.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 200,
-                "max": 200
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 762
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 220,
+                "max": 220
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 6.0,
+            "dropChance": 10.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -399,59 +433,1364 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 6,
-        "fightDifficulty": 7,
+        "fightDifficulty": 14,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 220,
-                "max": 220
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 814
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 30.0,
             "item": {
-              "type": "OwnableItemInfo",
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 240,
+                "max": 240
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 7,
+        "i18nDescriptionId": 0,
+        "duration": 8,
+        "fightDifficulty": 16,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 216
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 260,
+                "max": 260
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 8,
+        "i18nDescriptionId": 0,
+        "duration": 8,
+        "fightDifficulty": 18,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 645
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 280,
+                "max": 280
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 9,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 20,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 1.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 578
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 30.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 300,
+                "max": 300
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 10,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 22,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 815
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 320,
+                "max": 320
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 7,
+                "max": 7
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 11,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 24,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 579
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 340,
+                "max": 340
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 7,
+                "max": 7
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 12,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 26,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 822
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 360,
+                "max": 360
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 8,
+                "max": 8
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 13,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 28,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70744
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 380,
+                "max": 380
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 14,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 30,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 946
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 400,
+                "max": 400
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 15,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 32,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 762
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 420,
+                "max": 420
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 16,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 34,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 814
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 440,
+                "max": 440
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 17,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 36,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 216
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 460,
+                "max": 460
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 18,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 38,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 645
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 480,
+                "max": 480
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 19,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 40,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 2.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 578
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 35.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 500,
+                "max": 500
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 12.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 20,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 42,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 819
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 520,
+                "max": 520
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 21,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 44,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 579
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 540,
+                "max": 540
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 9,
+                "max": 9
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 22,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 46,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 391
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 560,
+                "max": 560
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 23,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 48,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70744
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 580,
+                "max": 580
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
                 "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 10,
+                "max": 10
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 24,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 50,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 83
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 600,
+                "max": 600
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 25,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 52,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 762
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 620,
+                "max": 620
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 15.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
+              }
+            }
+          }
+        ]
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 26,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 54,
+        "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 3.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 32
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 40.0,
+            "item": {
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
+              "count": {
+                "type": "MinMax",
+                "min": 640,
+                "max": 640
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 7.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -459,59 +1798,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 27,
         "i18nDescriptionId": 0,
-        "duration": 8,
-        "fightDifficulty": 8,
+        "duration": 10,
+        "fightDifficulty": 56,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 240,
-                "max": 240
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 216
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 660,
+                "max": 660
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "typeEnum": 23,
+                "value": 261
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 3,
+                "max": 3
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 8.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -519,59 +1863,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 28,
         "i18nDescriptionId": 0,
-        "duration": 8,
-        "fightDifficulty": 9,
+        "duration": 10,
+        "fightDifficulty": 58,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 260,
-                "max": 260
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 130
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 680,
+                "max": 680
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 9.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -579,59 +1928,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 29,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 10,
+        "fightDifficulty": 60,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 3.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 280,
-                "max": 280
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 578
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 40.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 675
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 8,
-                "max": 8
+                "min": 700,
+                "max": 700
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 815
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 15.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 69
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -639,59 +1993,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 11,
+        "chapterIndex": 30,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 11,
+        "fightDifficulty": 63,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 300,
-                "max": 300
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 819
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 720,
+                "max": 720
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 12,
+                "max": 12
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -699,59 +2058,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 12,
+        "chapterIndex": 31,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 12,
+        "fightDifficulty": 66,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 320,
-                "max": 320
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 579
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 740,
+                "max": 740
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 13,
+                "max": 13
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -759,59 +2123,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 13,
+        "chapterIndex": 32,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 13,
+        "fightDifficulty": 69,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 340,
-                "max": 340
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 391
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 760,
+                "max": 760
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 14,
+                "max": 14
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -819,59 +2188,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 14,
+        "chapterIndex": 33,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 14,
+        "fightDifficulty": 72,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 360,
-                "max": 360
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70744
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 780,
+                "max": 780
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 15,
+                "max": 15
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -879,27 +2253,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 15,
+        "chapterIndex": 34,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 15,
+        "fightDifficulty": 75,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 83
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 380,
-                "max": 380
+                "min": 800,
+                "max": 800
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -908,30 +2293,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -939,27 +2318,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 16,
+        "chapterIndex": 35,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 16,
+        "fightDifficulty": 78,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 762
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 400,
-                "max": 400
+                "min": 820,
+                "max": 820
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 20.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -968,30 +2358,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -999,27 +2383,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 17,
+        "chapterIndex": 36,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 17,
+        "fightDifficulty": 81,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 32
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 420,
-                "max": 420
+                "min": 840,
+                "max": 840
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1028,30 +2423,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1059,27 +2448,38 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 18,
+        "chapterIndex": 37,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 18,
+        "fightDifficulty": 84,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 216
+              }
+            }
+          },
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 45.0,
             "item": {
               "type": "GenericOwnableInfo",
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 440,
-                "max": 440
+                "min": 860,
+                "max": 860
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1088,30 +2488,24 @@
               },
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 4,
+                "max": 4
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 5,
-                "value": 946
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1119,59 +2513,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 19,
+        "chapterIndex": 38,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 19,
+        "fightDifficulty": 87,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 6.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 460,
-                "max": 460
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 130
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 880,
+                "max": 880
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1179,59 +2578,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 20,
+        "chapterIndex": 39,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 20,
+        "fightDifficulty": 90,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 4.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 480,
-                "max": 480
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 578
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 45.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 261
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 2,
-                "max": 2
+                "min": 900,
+                "max": 900
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 5,
-                "value": 946
+                "typeEnum": 23,
+                "value": 873
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 1,
+                "max": 1
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 17.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 545
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1239,11 +2643,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 21,
+        "chapterIndex": 40,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 21,
+        "fightDifficulty": 94,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 819
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1252,46 +2667,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 500,
-                "max": 500
+                "min": 920,
+                "max": 920
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 10.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 0.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 16,
+                "max": 16
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 0.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1299,59 +2708,64 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 22,
+        "chapterIndex": 41,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 22,
+        "fightDifficulty": 98,
         "rewards": [
           {
             "type": "SimpleLootEntry",
-            "dropChance": 50.0,
+            "dropChance": 5.0,
             "item": {
-              "type": "GenericOwnableInfo",
-              "genericType": 0,
-              "count": {
-                "type": "MinMax",
-                "min": 520,
-                "max": 520
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 579
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 12.0,
+            "dropChance": 50.0,
             "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 23,
-                "value": 873
-              },
+              "type": "GenericOwnableInfo",
+              "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
+                "min": 940,
+                "max": 940
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "typeEnum": 23,
+                "value": 675
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 17,
+                "max": 17
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1359,11 +2773,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 23,
+        "chapterIndex": 42,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 23,
+        "fightDifficulty": 102,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 391
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1372,46 +2797,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 540,
-                "max": 540
+                "min": 960,
+                "max": 960
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 14.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 1.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 18,
+                "max": 18
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 1.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1419,11 +2838,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 24,
+        "chapterIndex": 43,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 24,
+        "fightDifficulty": 106,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 70744
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1432,46 +2862,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 560,
-                "max": 560
+                "min": 980,
+                "max": 980
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 16.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 675
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 20,
+                "max": 20
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1479,11 +2903,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 25,
+        "chapterIndex": 44,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 25,
+        "fightDifficulty": 110,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 5,
+                "value": 83
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1492,46 +2927,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 580,
-                "max": 580
+                "min": 1000,
+                "max": 1000
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 18.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 2.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 2.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1539,11 +2968,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 26,
+        "chapterIndex": 45,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 26,
+        "fightDifficulty": 114,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 762
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1552,8 +2992,8 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 600,
-                "max": 600
+                "min": 1020,
+                "max": 1020
               }
             }
           },
@@ -1564,34 +3004,28 @@
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1599,11 +3033,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 27,
+        "chapterIndex": 46,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 27,
+        "fightDifficulty": 118,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 32
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1612,46 +3057,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 620,
-                "max": 620
+                "min": 1040,
+                "max": 1040
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 22.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 3.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 3.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1659,11 +3098,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 28,
+        "chapterIndex": 47,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 28,
+        "fightDifficulty": 122,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 216
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1672,46 +3122,40 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 640,
-                "max": 640
+                "min": 1060,
+                "max": 1060
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 24.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
                 "typeEnum": 23,
-                "value": 873
+                "value": 261
               },
               "count": {
                 "type": "MinMax",
-                "min": 1,
-                "max": 1
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
+                "min": 5,
+                "max": 5
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1719,11 +3163,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 29,
+        "chapterIndex": 48,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 29,
+        "fightDifficulty": 126,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 10.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 32,
+                "value": 130
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1732,14 +3187,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 660,
-                "max": 660
+                "min": 1080,
+                "max": 1080
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 27.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1755,23 +3210,17 @@
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 4.5,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 4.5,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 71
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1779,11 +3228,22 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 30,
+        "chapterIndex": 49,
         "i18nDescriptionId": 0,
         "duration": 10,
-        "fightDifficulty": 30,
+        "fightDifficulty": 130,
         "rewards": [
+          {
+            "type": "SimpleLootEntry",
+            "dropChance": 5.0,
+            "item": {
+              "type": "OwnableItemInfo",
+              "ownableId": {
+                "typeEnum": 25,
+                "value": 578
+              }
+            }
+          },
           {
             "type": "SimpleLootEntry",
             "dropChance": 50.0,
@@ -1792,14 +3252,14 @@
               "genericType": 0,
               "count": {
                 "type": "MinMax",
-                "min": 680,
-                "max": 680
+                "min": 1100,
+                "max": 1100
               }
             }
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 30.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
@@ -1815,23 +3275,17 @@
           },
           {
             "type": "SimpleLootEntry",
-            "dropChance": 5.0,
-            "item": {
-              "type": "OwnableItemInfo",
-              "ownableId": {
-                "typeEnum": 33,
-                "value": 404
-              }
-            }
-          },
-          {
-            "type": "SimpleLootEntry",
-            "dropChance": 5.0,
+            "dropChance": 20.0,
             "item": {
               "type": "OwnableItemInfo",
               "ownableId": {
-                "typeEnum": 33,
-                "value": 232
+                "typeEnum": 52,
+                "value": 894
+              },
+              "count": {
+                "type": "MinMax",
+                "min": 2,
+                "max": 2
               }
             }
           }
@@ -1839,7 +3293,7 @@
       }
     ]
   },
-  "m_displayName": "QUETE CHAFER - Les morts se lèvent...",
+  "m_displayName": "QUETE CHAFER - Q1 Les morts se lèvent...",
   "m_availability": 3,
   "m_i18nNameId": 33471
 }
\ No newline at end of file
diff --git a/data/json/QuestDefinition/84.json b/data/json/QuestDefinition/84.json
index b07f3edf100aed7e81e280cd8765f3116e306c07..e9e0cd3755e7a49f9384731743d036844f5b84c0 100644
--- a/data/json/QuestDefinition/84.json
+++ b/data/json/QuestDefinition/84.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 84,
-    "relatedFamily": 0,
+    "chaptersVisualId": 416,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,28 +13,37 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 3,
-        "rules": []
+        "startsAtChapter": 3
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 69801,
-        "startsAtChapter": 6,
-        "rules": []
+        "startsAtChapter": 6
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -56,7 +65,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -78,7 +87,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -100,7 +109,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -122,7 +131,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -144,7 +153,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
@@ -166,7 +175,7 @@
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
         "duration": 1,
         "fightDifficulty": 1,
diff --git a/data/json/QuestDefinition/9.json b/data/json/QuestDefinition/9.json
index 42b3b292350dd9814336114c3be8284021f42fbf..608b6ef46004ab77a0404b3b735332e1a06a6e2b 100644
--- a/data/json/QuestDefinition/9.json
+++ b/data/json/QuestDefinition/9.json
@@ -4,7 +4,7 @@
   "m_jsonRepresentation": {
     "type": "QuestDefinition",
     "id": 9,
-    "relatedFamily": 57,
+    "chaptersVisualId": 57,
     "minPlayers": 1,
     "maxPlayers": 3,
     "ranks": {
@@ -13,103 +13,272 @@
         "type": "AdventureRankInfo",
         "rank": 0,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 1,
-        "rules": []
+        "startsAtChapter": 1
       },
       "silver": {
         "type": "AdventureRankInfo",
         "rank": 1,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 11,
-        "rules": []
+        "startsAtChapter": 11
       },
       "gold": {
         "type": "AdventureRankInfo",
         "rank": 2,
         "i18nDescriptionId": 0,
-        "startsAtChapter": 21,
-        "rules": []
+        "startsAtChapter": 21
+      },
+      "platinum": {
+        "type": "AdventureRankInfo",
+        "rank": 3,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 31
+      },
+      "diamond": {
+        "type": "AdventureRankInfo",
+        "rank": 4,
+        "i18nDescriptionId": 0,
+        "startsAtChapter": 41
       }
     },
     "chapters": [
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 1,
+        "chapterIndex": 0,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 1,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 2,
+        "chapterIndex": 1,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 2,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 3,
+        "chapterIndex": 2,
         "i18nDescriptionId": 0,
-        "duration": 1,
+        "duration": 5,
         "fightDifficulty": 3,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 4,
+        "chapterIndex": 3,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 4,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 5,
+        "chapterIndex": 4,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 5,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 6,
+        "chapterIndex": 5,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 6,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 7,
+        "chapterIndex": 6,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 7,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 8,
+        "chapterIndex": 7,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 8,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 9,
+        "chapterIndex": 8,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 9,
         "rewards": []
       },
       {
         "type": "OldQuestChapterDefinition",
-        "chapterId": 10,
+        "chapterIndex": 9,
         "i18nDescriptionId": 0,
-        "duration": 1,
-        "fightDifficulty": 3,
+        "duration": 5,
+        "fightDifficulty": 10,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 10,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 11,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 11,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 12,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 12,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 13,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 13,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 14,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 14,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 15,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 15,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 16,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 16,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 17,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 17,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 18,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 18,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 19,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 19,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 20,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 20,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 21,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 21,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 22,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 22,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 23,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 23,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 24,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 24,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 25,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 25,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 26,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 26,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 27,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 27,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 28,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 28,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 29,
+        "rewards": []
+      },
+      {
+        "type": "OldQuestChapterDefinition",
+        "chapterIndex": 29,
+        "i18nDescriptionId": 0,
+        "duration": 10,
+        "fightDifficulty": 30,
         "rewards": []
       }
     ]
diff --git a/data/json/RingEquipmentDefinition/109.json b/data/json/RingEquipmentDefinition/109.json
index e8a00a6d61ce1261bb56664b62f8595a57b59a65..8d0874c1bbcf59fbdd494af724c78fcd336afb90 100644
--- a/data/json/RingEquipmentDefinition/109.json
+++ b/data/json/RingEquipmentDefinition/109.json
@@ -10,13 +10,14 @@
         "modifier": {
           "type": "BuffModifier",
           "caracIds": [
-            71
+            70
           ]
         },
         "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "kam",
-          "valueRefName": "Kamas"
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "loot",
+          "baseValue": 5.0,
+          "factor": 0.2
         }
       },
       {
@@ -24,30 +25,39 @@
         "modifier": {
           "type": "BuffModifier",
           "caracIds": [
-            70
+            71
           ]
         },
         "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "loot",
-          "valueRefName": "Loot"
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "kam",
+          "baseValue": 5.0,
+          "factor": 0.1
         }
       }
     ],
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 1000
+      }
+    ],
     "rarity": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "kam",
-          "valueRefName": "Kamas"
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "loot",
+          "baseValue": 5.0,
+          "factor": 0.2
         },
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "loot",
-          "valueRefName": "Loot"
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "kam",
+          "baseValue": 5.0,
+          "factor": 0.1
         }
       ],
       "hasEffects": false,
@@ -56,67 +66,7 @@
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Kamas",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Loot",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": []
   },
   "m_displayName": "COMMUN - Anneau Pulant",
   "m_availability": 3,
diff --git a/data/json/RingEquipmentDefinition/110.json b/data/json/RingEquipmentDefinition/110.json
deleted file mode 100644
index c24f866949f791011cbb432b83f91b73e1d93d61..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/110.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "110",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 110,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            78
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        3,
-        6,
-        7,
-        10,
-        12,
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.85
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.69,
-            "factor": 1.313
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 9.596,
-            "factor": 0.404
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Ph\u0027Tal\u0027Mo",
-  "m_availability": 3,
-  "assetGuid": "9dab468f6640d3347ba347356b03c580",
-  "m_i18nNameId": 83467,
-  "m_i18nDescriptionId": 85172,
-  "m_i18nBgDescriptionId": 4385
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/130.json b/data/json/RingEquipmentDefinition/130.json
index 19cb128ae173eda722467500978f6934a72be36e..4277bc99a4d3b96378399f7ed59b4a719e9b2b3d 100644
--- a/data/json/RingEquipmentDefinition/130.json
+++ b/data/json/RingEquipmentDefinition/130.json
@@ -4,91 +4,40 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 130,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 0,
+    "rarity": 2,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": false,
       "keywordReferences": []
     },
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 3,
-      "max": 110,
-      "visibleLevelAvailable": [
-        4,
-        7,
-        8,
-        11,
-        13,
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      20920,
+      601,
+      26312,
+      28353,
+      751,
+      28557,
+      193,
+      28924,
+      26320,
+      28856,
+      62,
+      852
+    ]
   },
-  "m_displayName": "COMMUN - Anneau Ptimâle",
+  "m_displayName": "RARE - Anneau Ptimale",
   "m_availability": 3,
   "assetGuid": "6fb3e48195bf7974e8697d061303e062",
   "m_i18nNameId": 89141,
diff --git a/data/json/RingEquipmentDefinition/157.json b/data/json/RingEquipmentDefinition/157.json
deleted file mode 100644
index de74eb9e0b8b00f8e149f0600d31771808ebc184..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/157.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "157",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 157,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            54,
-            55
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.6
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Armor",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 8.08,
-            "factor": 1.92
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Pake",
-  "m_availability": 3,
-  "assetGuid": "7e9ce0aec55ebf14f825c802b2d89e9d",
-  "m_i18nNameId": 40813,
-  "m_i18nDescriptionId": 44831,
-  "m_i18nBgDescriptionId": 36049
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/187.json b/data/json/RingEquipmentDefinition/187.json
deleted file mode 100644
index 73e201685714b5867b87907150708b8551306a8c..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/187.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "187",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 187,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            4
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dodge",
-          "valueRefName": "Dodge"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dodge",
-          "valueRefName": "Dodge"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.15
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Dodge",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 9.343,
-            "factor": 0.657
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Kupant",
-  "m_availability": 3,
-  "assetGuid": "80d3f24c6703f774e9135072284cf29c",
-  "m_i18nNameId": 28269,
-  "m_i18nDescriptionId": 80911,
-  "m_i18nBgDescriptionId": 8763
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/192.json b/data/json/RingEquipmentDefinition/192.json
deleted file mode 100644
index e4e7db5e0486111f28ff7ecf8ff5882bdc8eda07..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/192.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "192",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 192,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            16
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccP",
-          "valueRefName": "ccP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 2,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccP",
-          "valueRefName": "ccP"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 1
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 1,
-        "v": 1
-      },
-      {
-        "k": 40,
-        "v": 2
-      },
-      {
-        "k": 80,
-        "v": 3
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 11,
-      "max": 110,
-      "visibleLevelAvailable": [
-        12,
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 38.8,
-            "factor": 1.212
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "LEGEND - Muscapol",
-  "m_availability": 3,
-  "assetGuid": "e93f1969e04b2794cae4e4703d7b45ba",
-  "m_i18nNameId": 33892,
-  "m_i18nDescriptionId": 63935,
-  "m_i18nBgDescriptionId": 93173
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/200.json b/data/json/RingEquipmentDefinition/200.json
deleted file mode 100644
index e5693302f316eb8d7a9783155c5ddb2cc01cf75b..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/200.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "200",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 200,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 1
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 4,
-      "max": 110,
-      "visibleLevelAvailable": [
-        5,
-        6,
-        9,
-        11,
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.4
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Vulant",
-  "m_availability": 3,
-  "assetGuid": "c038ebffb88f18846ade20cc6404b612",
-  "m_i18nNameId": 9098,
-  "m_i18nDescriptionId": 12734,
-  "m_i18nBgDescriptionId": 86950
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/32.json b/data/json/RingEquipmentDefinition/32.json
index bafa737b76b01ac4bb0aae3add022503fc3f7e0d..34971ee8f159d08061db5f9806cbfdc7edcd8cc8 100644
--- a/data/json/RingEquipmentDefinition/32.json
+++ b/data/json/RingEquipmentDefinition/32.json
@@ -4,33 +4,22 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 32,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 0,
+    "rarity": 2,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "ar",
-          "value": 80
+          "value": 1
         }
       ],
       "hasEffects": false,
@@ -39,52 +28,26 @@
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 14,
-      "max": 110,
-      "visibleLevelAvailable": [
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      159,
+      106,
+      373,
+      515,
+      593,
+      823,
+      464,
+      25397,
+      330,
+      909,
+      285,
+      911,
+      283,
+      25890,
+      935,
+      25942
+    ]
   },
-  "m_displayName": "COMMUN - Anneau Gnon",
+  "m_displayName": "RARE - Anneau Gnon",
   "m_availability": 3,
   "assetGuid": "ca94a64e3ec6c36479ccb1ad5f958a74",
   "m_i18nNameId": 76366,
diff --git a/data/json/RingEquipmentDefinition/324.json b/data/json/RingEquipmentDefinition/324.json
deleted file mode 100644
index b28d4ba26ae95a4e17b754478361248d841d468a..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/324.json
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "324",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 324,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            54,
-            55
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            75
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        2,
-        5,
-        6,
-        9,
-        11,
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.25
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Armor",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "resP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Rak",
-  "m_availability": 3,
-  "assetGuid": "a8f10ef720f616c48858086175af3504",
-  "m_i18nNameId": 19299,
-  "m_i18nDescriptionId": 27108,
-  "m_i18nBgDescriptionId": 65595
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/369.json b/data/json/RingEquipmentDefinition/369.json
deleted file mode 100644
index 250010e8777b1c8a248b0f52b36c31885e96fab0..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/369.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "369",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 369,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            16
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccP",
-          "valueRefName": "ccP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccP",
-          "valueRefName": "ccP"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.7
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.182,
-            "factor": 1.818
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Strogote",
-  "m_availability": 3,
-  "assetGuid": "a70e5d0b75d27314d9dc8aac28237b3f",
-  "m_i18nNameId": 35088,
-  "m_i18nDescriptionId": 72167,
-  "m_i18nBgDescriptionId": 96142
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/389.json b/data/json/RingEquipmentDefinition/389.json
deleted file mode 100644
index d27d4f8486964b2a2097c1e8678d28a9de72e889..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/389.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "389",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 389,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            4
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dodge",
-          "valueRefName": "Dodge"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dodge",
-          "valueRefName": "Dodge"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "j",
-          "value": 1
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 5,
-      "max": 55,
-      "visibleLevelAvailable": [
-        6,
-        8,
-        10,
-        13,
-        18,
-        23,
-        28,
-        32,
-        36,
-        39,
-        44,
-        47
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Dodge",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Carina",
-  "m_availability": 3,
-  "assetGuid": "4e3b120c5a713354e8299693ca791f64",
-  "m_i18nNameId": 94154,
-  "m_i18nDescriptionId": 57510,
-  "m_i18nBgDescriptionId": 11673
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/39.json b/data/json/RingEquipmentDefinition/39.json
deleted file mode 100644
index 77a2353f675039304eb0b9c52178d984a6ffafa4..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/39.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "39",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 39,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "at",
-          "value": 25
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "ar",
-          "value": 100
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 8,
-      "max": 110,
-      "visibleLevelAvailable": [
-        10,
-        12,
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Klerdlalune",
-  "m_availability": 3,
-  "assetGuid": "718373c30d852824399d4e15bd9b7e7c",
-  "m_i18nNameId": 40651,
-  "m_i18nDescriptionId": 22085,
-  "m_i18nBgDescriptionId": 55875
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/392.json b/data/json/RingEquipmentDefinition/392.json
deleted file mode 100644
index 6afdc1d351a387640b42dba44a4f7b8e28c198e9..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/392.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "392",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 392,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 2,
-      "max": 110,
-      "visibleLevelAvailable": [
-        2,
-        5,
-        6,
-        9,
-        11,
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Pignatre",
-  "m_availability": 3,
-  "assetGuid": "08b04b9a2b4ab6a4584f959121e6a21e",
-  "m_i18nNameId": 42829,
-  "m_i18nDescriptionId": 97048,
-  "m_i18nBgDescriptionId": 3698
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/426.json b/data/json/RingEquipmentDefinition/426.json
index e7b606fa70dd4f981467011563b14146d57d4ecb..25a2830caaf0ee33417e166f6e813f56ec6f87d1 100644
--- a/data/json/RingEquipmentDefinition/426.json
+++ b/data/json/RingEquipmentDefinition/426.json
@@ -6,7 +6,7 @@
     "id": 426,
     "passiveModifiers": [],
     "merchantCosts": [],
-    "rarity": 2,
+    "rarity": 4,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
@@ -16,28 +16,10 @@
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 80,
-        "v": 3
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 80,
-      "max": 110,
-      "visibleLevelAvailable": [
-        80,
-        85,
-        90,
-        95,
-        100
-      ],
-      "value": []
-    }
+    "skills": []
   },
-  "m_displayName": "LEGEND - Anneau Mali",
-  "m_availability": 3,
+  "m_displayName": "TEMP - LEGEND - Anneau Mali",
+  "m_availability": 2,
   "assetGuid": "02a6d69baa72eb04b94fc7761dc7ab73",
   "m_i18nNameId": 71255,
   "m_i18nDescriptionId": 57081,
diff --git a/data/json/RingEquipmentDefinition/433.json b/data/json/RingEquipmentDefinition/433.json
deleted file mode 100644
index 9ca06dfa9ee35424c48285f1a023e0840de8eb02..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/433.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "433",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 433,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            54,
-            55
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Armor",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 8.0,
-            "factor": 1.92
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau KLM",
-  "m_availability": 3,
-  "assetGuid": "7e199d0ba4edf0841959531ec66b1395",
-  "m_i18nNameId": 71425,
-  "m_i18nDescriptionId": 36378,
-  "m_i18nBgDescriptionId": 38466
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/475.json b/data/json/RingEquipmentDefinition/475.json
deleted file mode 100644
index ee7080f2379059c9186946e697f3add03e960203..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/475.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "475",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 475,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            56
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "ar",
-          "value": 15
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 15,
-      "max": 110,
-      "visibleLevelAvailable": [
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.65
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Attack",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Cultant",
-  "m_availability": 3,
-  "assetGuid": "faa7d121274ea274ab2a68190640b92c",
-  "m_i18nNameId": 86775,
-  "m_i18nDescriptionId": 81587,
-  "m_i18nBgDescriptionId": 23767
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/506.json b/data/json/RingEquipmentDefinition/506.json
deleted file mode 100644
index 52d5552df4841a9cb2129d44c3d25b8409838987..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/506.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "506",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 506,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "ar",
-          "value": 15
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 15,
-      "max": 110,
-      "visibleLevelAvailable": [
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Lémain",
-  "m_availability": 3,
-  "assetGuid": "75b0a94ccf2a37440869a4fa8c05fef9",
-  "m_i18nNameId": 59088,
-  "m_i18nDescriptionId": 74524,
-  "m_i18nBgDescriptionId": 1294
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/508.json b/data/json/RingEquipmentDefinition/508.json
deleted file mode 100644
index a12f874a2a678baec983a8d3b51cf7215d489778..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/508.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "508",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 508,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 8,
-      "max": 110,
-      "visibleLevelAvailable": [
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.1
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 10.0,
-            "factor": 1.4
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Dylderay",
-  "m_availability": 3,
-  "assetGuid": "b302eb8f4e3459147877da707743ad65",
-  "m_i18nNameId": 37293,
-  "m_i18nDescriptionId": 64566,
-  "m_i18nBgDescriptionId": 75332
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/512.json b/data/json/RingEquipmentDefinition/512.json
deleted file mode 100644
index b90a61f2b5e2b33848e5eab892b55cb03f991d19..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/512.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "512",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 512,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            75
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "x",
-          "value": 20
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": [
-        "EXPLOSION"
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 13,
-      "max": 110,
-      "visibleLevelAvailable": [
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "resP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Bélisk",
-  "m_availability": 3,
-  "assetGuid": "71544f38b2fdb6947bcdc9fb4511e611",
-  "m_i18nNameId": 35144,
-  "m_i18nDescriptionId": 80318,
-  "m_i18nBgDescriptionId": 73495
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/529.json b/data/json/RingEquipmentDefinition/529.json
index eddb5e4cd9e2194d04a362ad01fc2389da9227cf..7c76b729d42b055aea6aed5829783068c1836c9d 100644
--- a/data/json/RingEquipmentDefinition/529.json
+++ b/data/json/RingEquipmentDefinition/529.json
@@ -4,82 +4,34 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 529,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            71
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "kam",
-          "valueRefName": "Kamas"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 2,
+    "rarity": 4,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "kanarPV",
+          "baseValue": 0.0,
+          "factor": 0.5
         },
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "kanarAT",
+          "baseValue": 0.0,
+          "factor": 0.5
         },
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "kam",
-          "valueRefName": "Kamas"
+          "type": "ConstIntegerValue",
+          "referenceId": "kanarPM",
+          "value": 1
         }
       ],
       "hasEffects": false,
@@ -94,93 +46,24 @@
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 1,
-        "v": 1
-      },
-      {
-        "k": 40,
-        "v": 2
-      },
-      {
-        "k": 80,
-        "v": 3
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 8,
-      "max": 110,
-      "visibleLevelAvailable": [
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.8
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.6
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Kamas",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      112,
+      416,
+      809,
+      397,
+      212,
+      42644,
+      41380,
+      42949,
+      41715,
+      43039,
+      42117,
+      43483,
+      42342,
+      427,
+      42597,
+      883
+    ]
   },
   "m_displayName": "LEGEND - Le Kamard",
   "m_availability": 3,
diff --git a/data/json/RingEquipmentDefinition/531.json b/data/json/RingEquipmentDefinition/531.json
deleted file mode 100644
index 233ad27af28494a090053368f38193b5291d96ff..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/531.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "531",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 531,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            75
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.15
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "resP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.87,
-            "factor": 1.313
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Greuh",
-  "m_availability": 3,
-  "assetGuid": "3bddc7bc8fe84d24680f53b936ff0d5a",
-  "m_i18nNameId": 69559,
-  "m_i18nDescriptionId": 38633,
-  "m_i18nBgDescriptionId": 17091
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/539.json b/data/json/RingEquipmentDefinition/539.json
deleted file mode 100644
index 7350cb52dcb0db0f6a6ba3d90a80545483d5acfe..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/539.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "539",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 539,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            78
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 7,
-      "max": 110,
-      "visibleLevelAvailable": [
-        10,
-        12,
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 38.4,
-            "factor": 1.616
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 9.6,
-            "factor": 0.404
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Busier",
-  "m_availability": 3,
-  "assetGuid": "b79e650f80861ae4ebfd0475aa08427c",
-  "m_i18nNameId": 43610,
-  "m_i18nDescriptionId": 1910,
-  "m_i18nBgDescriptionId": 57502
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/541.json b/data/json/RingEquipmentDefinition/541.json
deleted file mode 100644
index bcee8507df87c777f50ea7ddee54ba971a1f58ba..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/541.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "541",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 541,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            16
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccP",
-          "valueRefName": "ccP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            18
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccP",
-          "valueRefName": "dccP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccP",
-          "valueRefName": "ccP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccP",
-          "valueRefName": "dccP"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        4,
-        7,
-        8,
-        11,
-        13,
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 1.0,
-            "factor": 0.99
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.69,
-            "factor": 1.313
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dccP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 9.596,
-            "factor": 0.404
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Pinel",
-  "m_availability": 3,
-  "assetGuid": "344be9ae4a6abc543a1db58d409723c9",
-  "m_i18nNameId": 83925,
-  "m_i18nDescriptionId": 80580,
-  "m_i18nBgDescriptionId": 10024
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/550.json b/data/json/RingEquipmentDefinition/550.json
deleted file mode 100644
index 36e958f438721991d49c839fa8c11e66e799ed23..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/550.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "550",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 550,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            56
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Attack",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 7.0,
-            "factor": 2.42
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Fensif",
-  "m_availability": 3,
-  "assetGuid": "cb452372adcb70b49a09f1ffaf9bc3ab",
-  "m_i18nNameId": 77284,
-  "m_i18nDescriptionId": 7540,
-  "m_i18nBgDescriptionId": 27319
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/563.json b/data/json/RingEquipmentDefinition/563.json
index 86e394cc9b0f3fa6c9d2c3f103ca4b4c3dee2261..8d8bfa109805e51d1c6c4d9b6395fb18b59c4304 100644
--- a/data/json/RingEquipmentDefinition/563.json
+++ b/data/json/RingEquipmentDefinition/563.json
@@ -4,118 +4,40 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 563,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            56
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 0,
+    "rarity": 2,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": false,
       "keywordReferences": []
     },
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.25
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Attack",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 8.0,
-            "factor": 1.92
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      19731,
+      742,
+      22887,
+      28972,
+      439,
+      29008,
+      19753,
+      715,
+      22724,
+      29103,
+      425,
+      936
+    ]
   },
-  "m_displayName": "COMMUN - Anneau Céan",
+  "m_displayName": "RARE - Anneau Céan",
   "m_availability": 3,
   "assetGuid": "58fca74a36dbdb244bbbb3900c6b9100",
   "m_i18nNameId": 21894,
diff --git a/data/json/RingEquipmentDefinition/567.json b/data/json/RingEquipmentDefinition/567.json
deleted file mode 100644
index b06a8b5abd6bd76a80660d06ec553a96186d3a82..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/567.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "567",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 567,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 2
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 7,
-      "max": 110,
-      "visibleLevelAvailable": [
-        7,
-        8,
-        11,
-        13,
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.6
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Tilus",
-  "m_availability": 3,
-  "assetGuid": "604664bbaf44eb442998ec49c1c8bc52",
-  "m_i18nNameId": 82174,
-  "m_i18nDescriptionId": 7453,
-  "m_i18nBgDescriptionId": 27382
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/569.json b/data/json/RingEquipmentDefinition/569.json
index 36709f91b4d0ee63760b9b339802eea2bcdea9a1..03d94a64312c8b9667d8dba7a983b10edac325be 100644
--- a/data/json/RingEquipmentDefinition/569.json
+++ b/data/json/RingEquipmentDefinition/569.json
@@ -4,154 +4,49 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 569,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            78
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 2,
+    "rarity": 4,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        },
+      "dynamicValueReferences": [],
+      "hasEffects": false,
+      "keywordReferences": [
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
+          "type": 4,
+          "id": 36
         }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
+      ]
     },
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 1,
-        "v": 1
-      },
-      {
-        "k": 40,
-        "v": 2
-      },
-      {
-        "k": 80,
-        "v": 3
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 11,
-      "max": 110,
-      "visibleLevelAvailable": [
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.6
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.5
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      617,
+      544,
+      46585,
+      228,
+      41524,
+      41940,
+      41756,
+      578,
+      41763,
+      725,
+      378,
+      944,
+      85,
+      42144,
+      610,
+      443
+    ]
   },
-  "m_displayName": "LEGEND - Ploutrozorus",
+  "m_displayName": "LEGEND - Le Ploutrozorus",
   "m_availability": 3,
   "assetGuid": "75d061466cc3c8140a2ef96ba5868f38",
   "m_i18nNameId": 90960,
diff --git a/data/json/RingEquipmentDefinition/58.json b/data/json/RingEquipmentDefinition/58.json
deleted file mode 100644
index 0d27ed526027f5976e492faa388af1e74d33e08e..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/58.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "58",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 58,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            54,
-            55
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "j",
-          "value": 1
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 5,
-      "max": 55,
-      "visibleLevelAvailable": [
-        7,
-        10,
-        14,
-        17,
-        20,
-        24,
-        28,
-        32,
-        35,
-        40,
-        45,
-        50
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Armor",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 4.8
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Deter",
-  "m_availability": 3,
-  "assetGuid": "6b4a7ae87f8105b48aee946180d45885",
-  "m_i18nNameId": 98893,
-  "m_i18nDescriptionId": 83153,
-  "m_i18nBgDescriptionId": 44362
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/580.json b/data/json/RingEquipmentDefinition/580.json
deleted file mode 100644
index 81ecf2210ac1e799ae9beca9cac23826a1208060..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/580.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "580",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 580,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "bl",
-          "value": 100
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 13,
-      "max": 110,
-      "visibleLevelAvailable": [
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.4
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Tomatik",
-  "m_availability": 3,
-  "assetGuid": "c529d002c3f3baf49883d6cbb6ff21a3",
-  "m_i18nNameId": 52856,
-  "m_i18nDescriptionId": 25336,
-  "m_i18nBgDescriptionId": 35263
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/610.json b/data/json/RingEquipmentDefinition/610.json
index 7a6f311ecd8db92986679c022e21bc8c69415ab4..a6bfb17b63852cf82b66f428a9748c829ea7a038 100644
--- a/data/json/RingEquipmentDefinition/610.json
+++ b/data/json/RingEquipmentDefinition/610.json
@@ -11,9 +11,10 @@
           "type": "LifeModifier"
         },
         "value": {
-          "type": "ThisRingRangeDynamicValue",
+          "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "pdv",
-          "valueRefName": "PDV"
+          "baseValue": 10.0,
+          "factor": 0.3
         }
       },
       {
@@ -25,26 +26,35 @@
           ]
         },
         "value": {
-          "type": "ThisRingRangeDynamicValue",
+          "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "dmgM",
-          "valueRefName": "dmgM"
+          "baseValue": 5.0,
+          "factor": 0.2
         }
       }
     ],
-    "merchantCosts": [],
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 1000
+      }
+    ],
     "rarity": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "ThisRingRangeDynamicValue",
+          "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "pdv",
-          "valueRefName": "PDV"
+          "baseValue": 10.0,
+          "factor": 0.3
         },
         {
-          "type": "ThisRingRangeDynamicValue",
+          "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "dmgM",
-          "valueRefName": "dmgM"
+          "baseValue": 5.0,
+          "factor": 0.2
         }
       ],
       "hasEffects": false,
@@ -53,67 +63,7 @@
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.9
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.9
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": []
   },
   "m_displayName": "COMMUN - Anneau Zamour",
   "m_availability": 3,
diff --git a/data/json/RingEquipmentDefinition/619.json b/data/json/RingEquipmentDefinition/619.json
deleted file mode 100644
index 5ee1d074f13fe31756a41ef066c61bb4f180d22a..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/619.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "619",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 619,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "at",
-          "value": 15
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 15,
-      "max": 110,
-      "visibleLevelAvailable": [
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Rajone",
-  "m_availability": 3,
-  "assetGuid": "fca09cbc2e5560c46a9a0542ebc08dac",
-  "m_i18nNameId": 24603,
-  "m_i18nDescriptionId": 59875,
-  "m_i18nBgDescriptionId": 49248
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/645.json b/data/json/RingEquipmentDefinition/645.json
index 86f55a3b4b4f8ab351ed0fc9ba35cc8000ddd315..83561bc4931452546addcfb45eca87189d03651f 100644
--- a/data/json/RingEquipmentDefinition/645.json
+++ b/data/json/RingEquipmentDefinition/645.json
@@ -5,46 +5,36 @@
     "type": "RingEquipmentDefinition",
     "id": 645,
     "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
       {
         "type": "PassiveModifier",
         "modifier": {
           "type": "BuffModifier",
           "caracIds": [
-            56
+            58
           ]
         },
         "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
+          "type": "ConstIntegerValue",
+          "referenceId": "att",
+          "value": 20
         }
       }
     ],
-    "merchantCosts": [],
-    "rarity": 0,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
+    "rarity": 2,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
+          "type": "ConstIntegerValue",
+          "referenceId": "att",
+          "value": 20
         }
       ],
       "hasEffects": false,
@@ -53,69 +43,22 @@
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Attack",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 8.08,
-            "factor": 1.92
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      97,
+      25978,
+      537,
+      454,
+      22,
+      554,
+      19984,
+      26047,
+      362,
+      26058,
+      40884,
+      181
+    ]
   },
-  "m_displayName": "COMMUN - Anneau Bstiné",
+  "m_displayName": "RARE - Anneau Bstiné",
   "m_availability": 3,
   "assetGuid": "2dd52eee02cfd17479f6f6a4738f8096",
   "m_i18nNameId": 26921,
diff --git a/data/json/RingEquipmentDefinition/658.json b/data/json/RingEquipmentDefinition/658.json
deleted file mode 100644
index 6e6dbf8599f0b8ae02a449c85734f2ca205aca94..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/658.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "658",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 658,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 7,
-      "max": 110,
-      "visibleLevelAvailable": [
-        8,
-        11,
-        13,
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 3.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Verbouké",
-  "m_availability": 3,
-  "assetGuid": "fd4e666c7bd784abbb79ce212b2c372a",
-  "m_i18nNameId": 66508,
-  "m_i18nDescriptionId": 21877,
-  "m_i18nBgDescriptionId": 73068
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/665.json b/data/json/RingEquipmentDefinition/665.json
deleted file mode 100644
index 8e17a301578078459887064db23e2e13ff860ce8..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/665.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "665",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 665,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Rible",
-  "m_availability": 3,
-  "assetGuid": "c6155549348b2a54aaaf5e747a77101e",
-  "m_i18nNameId": 66980,
-  "m_i18nDescriptionId": 88900,
-  "m_i18nBgDescriptionId": 87240
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/731.json b/data/json/RingEquipmentDefinition/731.json
deleted file mode 100644
index ce9505f95044ae6aeeedb70974d4fd5c40eeda9c..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/731.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "731",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 731,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            78
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dccM",
-          "valueRefName": "dccM"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "x",
-          "value": 30
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": [
-        "EXPLOSION"
-      ]
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 13,
-      "max": 110,
-      "visibleLevelAvailable": [
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.75
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Réo",
-  "m_availability": 3,
-  "assetGuid": "c64cc30f0eb7d354a91ddfdfe55b0869",
-  "m_i18nNameId": 79921,
-  "m_i18nDescriptionId": 21700,
-  "m_i18nBgDescriptionId": 26579
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/733.json b/data/json/RingEquipmentDefinition/733.json
deleted file mode 100644
index 7cde8269b98e0a78156123cb1a3104d78f0be5ec..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/733.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "733",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 733,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            53
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pv",
-          "value": 40
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 15,
-      "max": 110,
-      "visibleLevelAvailable": [
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Heal",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Devie",
-  "m_availability": 3,
-  "assetGuid": "5fd82fa3c9c9e0448a6ae7c1706cd8dc",
-  "m_i18nNameId": 62204,
-  "m_i18nDescriptionId": 76525,
-  "m_i18nBgDescriptionId": 27131
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/740.json b/data/json/RingEquipmentDefinition/740.json
deleted file mode 100644
index f4c7e903605b33339ddda41293cea97ae4a5aaa3..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/740.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "740",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 740,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            56
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "atk",
-          "value": 15
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 10,
-      "max": 110,
-      "visibleLevelAvailable": [
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Attack",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Bsaine",
-  "m_availability": 3,
-  "assetGuid": "41e211cee9e864142b6b66769db9cd31",
-  "m_i18nNameId": 69755,
-  "m_i18nDescriptionId": 3237,
-  "m_i18nBgDescriptionId": 57401
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/757.json b/data/json/RingEquipmentDefinition/757.json
deleted file mode 100644
index 3d789572a6b0ecc29e662f97c86190c67ae4d924..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/757.json
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "757",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 757,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            54,
-            55
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            53
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 2
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 6,
-      "max": 110,
-      "visibleLevelAvailable": [
-        9,
-        11,
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Armor",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Heal",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.5
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Nymousse",
-  "m_availability": 3,
-  "assetGuid": "734fa7fcdb3244047b9353f9abacc40e",
-  "m_i18nNameId": 32696,
-  "m_i18nDescriptionId": 97558,
-  "m_i18nBgDescriptionId": 40243
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/765.json b/data/json/RingEquipmentDefinition/765.json
deleted file mode 100644
index d88687d6c6c003b67c7e43ea5843be391ef90a95..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/765.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "765",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 765,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            75
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resP",
-          "valueRefName": "resP"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.9
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "resP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.87,
-            "factor": 1.213
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Lélé",
-  "m_availability": 3,
-  "assetGuid": "5a9df6c0ad6acf74fae528148cae1d75",
-  "m_i18nNameId": 92781,
-  "m_i18nDescriptionId": 46304,
-  "m_i18nBgDescriptionId": 80844
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/773.json b/data/json/RingEquipmentDefinition/773.json
deleted file mode 100644
index fa2e0c65818b852b20706469b5dc4128de83c177..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/773.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "773",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 773,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            53
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "j",
-          "value": 1
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 5,
-      "max": 60,
-      "visibleLevelAvailable": [
-        6,
-        7,
-        10,
-        12,
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Heal",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 4.8
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - L\u0027Ann\u0027Eau",
-  "m_availability": 3,
-  "assetGuid": "5a965685927fae84bafc848b1d807e18",
-  "m_i18nNameId": 66601,
-  "m_i18nDescriptionId": 29668,
-  "m_i18nBgDescriptionId": 41300
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/805.json b/data/json/RingEquipmentDefinition/805.json
index 5e3b0493dad164b46546eed3978bd24f974c08e0..1388c4acc6e7a149763fe58533d30e7a5cf03610 100644
--- a/data/json/RingEquipmentDefinition/805.json
+++ b/data/json/RingEquipmentDefinition/805.json
@@ -4,91 +4,40 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 805,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 0,
+    "rarity": 2,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": false,
       "keywordReferences": []
     },
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 3,
-      "max": 110,
-      "visibleLevelAvailable": [
-        3,
-        6,
-        7,
-        10,
-        12,
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      20395,
+      27732,
+      107,
+      438,
+      22414,
+      28096,
+      230,
+      928,
+      290,
+      798,
+      178,
+      28146
+    ]
   },
-  "m_displayName": "COMMUN - Anneau Problemo",
+  "m_displayName": "RARE - Anneau Problemo",
   "m_availability": 3,
   "assetGuid": "185e7e01ecc012a4da4cfcf711a4d272",
   "m_i18nNameId": 43425,
diff --git a/data/json/RingEquipmentDefinition/831.json b/data/json/RingEquipmentDefinition/831.json
deleted file mode 100644
index 3e0b8af8ce0a60934d407dc0a834f28bc58672dd..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/831.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "831",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 831,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            70
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "loot",
-          "valueRefName": "Loot"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "loot",
-          "valueRefName": "Loot"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Loot",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.5
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Nolimit",
-  "m_availability": 3,
-  "assetGuid": "cc7a3b729560a794da623eb0f643ca05",
-  "m_i18nNameId": 96424,
-  "m_i18nDescriptionId": 68203,
-  "m_i18nBgDescriptionId": 16980
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/847.json b/data/json/RingEquipmentDefinition/847.json
deleted file mode 100644
index d7af854c953652c5e717c16d610ed45b02133379..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/847.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "847",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 847,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "at",
-          "value": 15
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 14,
-      "max": 110,
-      "visibleLevelAvailable": [
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.25
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Rifice",
-  "m_availability": 3,
-  "assetGuid": "58e144d92c1b687449865e884ff8cef8",
-  "m_i18nNameId": 26549,
-  "m_i18nDescriptionId": 59826,
-  "m_i18nBgDescriptionId": 78614
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/884.json b/data/json/RingEquipmentDefinition/884.json
index 879bc7971f92382470f71199d5a9ed349f729f93..77d565bd7da4b35a642afa8c3fedc57a19e259f7 100644
--- a/data/json/RingEquipmentDefinition/884.json
+++ b/data/json/RingEquipmentDefinition/884.json
@@ -4,91 +4,44 @@
   "m_jsonRepresentation": {
     "type": "RingEquipmentDefinition",
     "id": 884,
-    "passiveModifiers": [
+    "passiveModifiers": [],
+    "merchantCosts": [
       {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
       }
     ],
-    "merchantCosts": [],
-    "rarity": 0,
+    "rarity": 2,
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FROZEN"
+      ]
     },
     "element": 6,
     "family": 0,
     "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        4,
-        7,
-        8,
-        11,
-        13,
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52,
-        59,
-        65,
-        71,
-        76,
-        85,
-        90,
-        99,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.15
-          },
-          "factor": 1.0
-        }
-      ]
-    }
+    "skills": [
+      34316,
+      39902,
+      34671,
+      39968,
+      287,
+      34,
+      430,
+      39981,
+      34695,
+      580,
+      35457,
+      108,
+      35577,
+      40184
+    ]
   },
-  "m_displayName": "COMMUN - Anneau Marchetif",
+  "m_displayName": "RARE - Anneau Marchetif",
   "m_availability": 3,
   "assetGuid": "42cdad78910db4747a77b5786d22b02d",
   "m_i18nNameId": 32896,
diff --git a/data/json/RingEquipmentDefinition/888.json b/data/json/RingEquipmentDefinition/888.json
deleted file mode 100644
index 303f2c103111a3c5546a623d37eddda2115e37bb..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/888.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "888",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 888,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            76
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resM",
-          "valueRefName": "resM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "resM",
-          "valueRefName": "resM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "resM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.87,
-            "factor": 1.213
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Bague Hette",
-  "m_availability": 3,
-  "assetGuid": "8299b0259bac83e47a393693556e9f8c",
-  "m_i18nNameId": 86637,
-  "m_i18nDescriptionId": 89151,
-  "m_i18nBgDescriptionId": 50164
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/907.json b/data/json/RingEquipmentDefinition/907.json
deleted file mode 100644
index 064701cd6a0f878524ffa1dab3a38701eedac4ab..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/907.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "907",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 907,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            17
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ccM",
-          "valueRefName": "ccM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.15
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "ccM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 18.182,
-            "factor": 1.818
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Taku",
-  "m_availability": 3,
-  "assetGuid": "73b29f929833d5e4aadb88cb163d2bf8",
-  "m_i18nNameId": 14385,
-  "m_i18nDescriptionId": 32714,
-  "m_i18nBgDescriptionId": 26464
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/909.json b/data/json/RingEquipmentDefinition/909.json
deleted file mode 100644
index dce2ca2c22c7f1cdabc5401cba9aba171d161ffe..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/909.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "909",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 909,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            77
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgM",
-          "valueRefName": "dmgM"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 8,
-      "max": 110,
-      "visibleLevelAvailable": [
-        9,
-        11,
-        14,
-        16,
-        19,
-        22,
-        26,
-        30,
-        34,
-        37,
-        42,
-        47,
-        50,
-        57,
-        63,
-        69,
-        74,
-        83,
-        88,
-        97,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgM",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Rifique",
-  "m_availability": 3,
-  "assetGuid": "c4a1aaf73f53470439fcb78fa79d771b",
-  "m_i18nNameId": 53186,
-  "m_i18nDescriptionId": 23676,
-  "m_i18nBgDescriptionId": 41158
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/928.json b/data/json/RingEquipmentDefinition/928.json
deleted file mode 100644
index ad2c29993e8646fe730527eb2bc89595f0a1807b..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/928.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "928",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 928,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            64
-          ]
-        },
-        "value": {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 1
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "ActionValueModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            53
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 1
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "dmgP",
-          "valueRefName": "dmgP"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 3,
-      "max": 110,
-      "visibleLevelAvailable": [
-        6,
-        7,
-        10,
-        12,
-        15,
-        17,
-        20,
-        23,
-        27,
-        31,
-        35,
-        38,
-        43,
-        48,
-        51,
-        58,
-        64,
-        70,
-        75,
-        84,
-        89,
-        98,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "dmgP",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Heal",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 2.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Rizon",
-  "m_availability": 3,
-  "assetGuid": "aa9cc5acf2f869641a488eded8ee486f",
-  "m_i18nNameId": 15967,
-  "m_i18nDescriptionId": 63435,
-  "m_i18nBgDescriptionId": 18052
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/97.json b/data/json/RingEquipmentDefinition/97.json
deleted file mode 100644
index 0160d35aa391134f9fe03c3c88189143f9cec4fa..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/97.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "97",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 97,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            53
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 1,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "h",
-          "valueRefName": "Heal"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pv",
-          "value": 15
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 10,
-        "v": 1
-      },
-      {
-        "k": 60,
-        "v": 2
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 14,
-      "max": 110,
-      "visibleLevelAvailable": [
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 0.5
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Heal",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.0
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "RARE - Anneau Pital",
-  "m_availability": 3,
-  "assetGuid": "b293885ead5bed744a89008d8b35ac22",
-  "m_i18nNameId": 62697,
-  "m_i18nDescriptionId": 46695,
-  "m_i18nBgDescriptionId": 58245
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/978.json b/data/json/RingEquipmentDefinition/978.json
deleted file mode 100644
index 4ddded49740d498d498de56927c64724de768a0a..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/978.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "978",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 978,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            56
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "at",
-          "valueRefName": "Attack"
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "j",
-          "value": 1
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 5,
-      "max": 55,
-      "visibleLevelAvailable": [
-        7,
-        8,
-        11,
-        13,
-        16,
-        18,
-        21,
-        24,
-        28,
-        32,
-        36,
-        39,
-        44,
-        49,
-        52
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Attack",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 4.8
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Vulk Anneau",
-  "m_availability": 3,
-  "assetGuid": "b8f4123cdd787054ca34b999dca13c37",
-  "m_i18nNameId": 62963,
-  "m_i18nDescriptionId": 22264,
-  "m_i18nBgDescriptionId": 75453
-}
\ No newline at end of file
diff --git a/data/json/RingEquipmentDefinition/994.json b/data/json/RingEquipmentDefinition/994.json
deleted file mode 100644
index e8dd727c461c131f73f1c28401d2d089ca43b35b..0000000000000000000000000000000000000000
--- a/data/json/RingEquipmentDefinition/994.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "994",
-  "m_jsonRepresentation": {
-    "type": "RingEquipmentDefinition",
-    "id": 994,
-    "passiveModifiers": [
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "LifeModifier"
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        }
-      },
-      {
-        "type": "PassiveModifier",
-        "modifier": {
-          "type": "BuffModifier",
-          "caracIds": [
-            54,
-            55
-          ]
-        },
-        "value": {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      }
-    ],
-    "merchantCosts": [],
-    "rarity": 0,
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "pdv",
-          "valueRefName": "PDV"
-        },
-        {
-          "type": "ThisRingRangeDynamicValue",
-          "referenceId": "ar",
-          "valueRefName": "Armor"
-        }
-      ],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "element": 6,
-    "family": 0,
-    "spellEffectData": [],
-    "slots": [
-      {
-        "k": 20,
-        "v": 1
-      }
-    ],
-    "rangeValues": {
-      "type": "RingRanges",
-      "min": 1,
-      "max": 110,
-      "visibleLevelAvailable": [
-        1,
-        4,
-        5,
-        8,
-        10,
-        13,
-        15,
-        18,
-        21,
-        25,
-        29,
-        33,
-        36,
-        41,
-        46,
-        49,
-        56,
-        62,
-        68,
-        73,
-        82,
-        87,
-        96,
-        100
-      ],
-      "value": [
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "PDV",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 0.0,
-            "factor": 1.25
-          },
-          "factor": 1.0
-        },
-        {
-          "type": "ThisRingValue",
-          "thisRingValueRefName": "Armor",
-          "value": {
-            "type": "LinearLevelOnlyBasedDynamicValue",
-            "referenceId": "",
-            "baseValue": 8.0,
-            "factor": 1.92
-          },
-          "factor": 1.0
-        }
-      ]
-    }
-  },
-  "m_displayName": "COMMUN - Anneau Fer",
-  "m_availability": 3,
-  "assetGuid": "d2fae94653915d541a3d0429c83ca00a",
-  "m_i18nNameId": 46039,
-  "m_i18nDescriptionId": 64334,
-  "m_i18nBgDescriptionId": 80716
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/108.json b/data/json/SingleObtainableItemListDefinition/108.json
index abab7f8af0b047a5732c1c64ea3c0203dbd38881..45109d12009172bf611542a464f21ede915aa79e 100644
--- a/data/json/SingleObtainableItemListDefinition/108.json
+++ b/data/json/SingleObtainableItemListDefinition/108.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 195
+          "typeEnum": 25,
+          "value": 493
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Kasimordo",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - SERGENT - Kasimordo",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/141.json b/data/json/SingleObtainableItemListDefinition/141.json
index 0b7ab7ed1ae972b6dd29429d7a9920788be11127..cf20ce4b18e2b5cd2bcee86961a2d34a2c7633d2 100644
--- a/data/json/SingleObtainableItemListDefinition/141.json
+++ b/data/json/SingleObtainableItemListDefinition/141.json
@@ -8,12 +8,19 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 601
+          "typeEnum": 25,
+          "value": 197
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 25,
+          "value": 406
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Arbatarba",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - TROUFION - Arbatarba",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/15.json b/data/json/SingleObtainableItemListDefinition/15.json
index 93f3596797ca5aca58d7a636cdab8f0d0ff527e9..b4f1c25ead7cdbbfed2d4e9cd5760732062653cf 100644
--- a/data/json/SingleObtainableItemListDefinition/15.json
+++ b/data/json/SingleObtainableItemListDefinition/15.json
@@ -9,18 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 610
+          "value": 465
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 475
+          "value": 575
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Blockmort",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - SERGENT - Blockmort",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/151.json b/data/json/SingleObtainableItemListDefinition/151.json
deleted file mode 100644
index 4709d53c9247ab13dbb7e8a9caba498d7fb73f9c..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/151.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "151",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 151,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 98
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 176
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Cochon - 6",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/170.json b/data/json/SingleObtainableItemListDefinition/170.json
deleted file mode 100644
index 6473dd078c68799480ee596255fbfb56c23bb899..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/170.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "170",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 170,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 847
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 135
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 661
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Cochon - 7+",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/178.json b/data/json/SingleObtainableItemListDefinition/178.json
index ec6c320cfcf3b9057c461598a8a3b7defc92c711..011d31f3a2eb3d81c7f0afee3e6bf513ee139255 100644
--- a/data/json/SingleObtainableItemListDefinition/178.json
+++ b/data/json/SingleObtainableItemListDefinition/178.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 159
+          "typeEnum": 25,
+          "value": 66688
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Perigourdin",
+  "m_displayName": "MONSTRES - COCHON - SORTS - BOSS - Perigourdin",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/187.json b/data/json/SingleObtainableItemListDefinition/187.json
index c493c8adf26fa44e0e4f7879fb783afd0a590ac8..2cc52e889514da6f359b51b44e83314bdb67c239 100644
--- a/data/json/SingleObtainableItemListDefinition/187.json
+++ b/data/json/SingleObtainableItemListDefinition/187.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 387
+          "typeEnum": 25,
+          "value": 273
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Grignoteur",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - BOSS - Grignoteur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/238.json b/data/json/SingleObtainableItemListDefinition/238.json
index 5d907ced1347d0f94ae9a6ad2e761c415333df22..6abfa7671523e119b95b118cf39eaaf8bd87e70b 100644
--- a/data/json/SingleObtainableItemListDefinition/238.json
+++ b/data/json/SingleObtainableItemListDefinition/238.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 713
+          "typeEnum": 25,
+          "value": 68796
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Gro Bwork",
+  "m_displayName": "MONSTRES - BWORK - SORTS - SERGENT - Gro Bwork",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/244.json b/data/json/SingleObtainableItemListDefinition/244.json
index d49783527b11af04edf758cfae2bf84f0cd3e1d3..ce2df6145aa4d651ed2682167d575dca0082bc62 100644
--- a/data/json/SingleObtainableItemListDefinition/244.json
+++ b/data/json/SingleObtainableItemListDefinition/244.json
@@ -9,88 +9,88 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 550
+          "value": 250
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 157
+          "value": 652
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 907
+          "value": 204
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 610
+          "value": 576
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 888
+          "value": 575
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 619
+          "value": 170
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 39
+          "value": 610
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 475
+          "value": 465
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 539
+          "value": 514
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 110
+          "value": 967
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 567
+          "value": 697
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 569
+          "value": 914
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/253.json b/data/json/SingleObtainableItemListDefinition/253.json
index 83740ae0645da2175c9b811093d5f8aecf5d2e58..3cdc063a632c8bdb0e849383fd1d9c7013ff215a 100644
--- a/data/json/SingleObtainableItemListDefinition/253.json
+++ b/data/json/SingleObtainableItemListDefinition/253.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 39
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 567
+          "value": 697
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Kasimordo",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - SERGENT - Kasimordo",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/275.json b/data/json/SingleObtainableItemListDefinition/275.json
index eb3ef58ad614ce0cbbb45706044f8927bfe6624d..d9e8c4f14ad9e332dfb1e7d162b7ce539bebe122 100644
--- a/data/json/SingleObtainableItemListDefinition/275.json
+++ b/data/json/SingleObtainableItemListDefinition/275.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 731
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 541
+          "value": 147
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Bworkakorn",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - SERGENT - Bworkakorn",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/286.json b/data/json/SingleObtainableItemListDefinition/286.json
deleted file mode 100644
index 2d38960a45200f13a8adf984fc402f4fecf5fb1f..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/286.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "286",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 286,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 524
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 698
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 361
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 328
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 991
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 597
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 357
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 15
-        }
-      }
-    ]
-  },
-  "m_displayName": "MONSTRES - Gemmes",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/293.json b/data/json/SingleObtainableItemListDefinition/293.json
index 5fa76a579712208c53eb03d521ecca3d67f4fda5..ad6ce7c8c9ff2c073b12d7bc8f6457041ffc36ac 100644
--- a/data/json/SingleObtainableItemListDefinition/293.json
+++ b/data/json/SingleObtainableItemListDefinition/293.json
@@ -187,6 +187,6 @@
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Boss",
+  "m_displayName": "MONSTRES - FRAGMENTS - BOSS",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/294.json b/data/json/SingleObtainableItemListDefinition/294.json
index 9e968c60222d3bd1fea2bc21e7567d96dcfc8843..ed95cf9b0b67ba7f0fe4793503f1e7e6870271cb 100644
--- a/data/json/SingleObtainableItemListDefinition/294.json
+++ b/data/json/SingleObtainableItemListDefinition/294.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 994
+          "value": 466
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 986
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Graton",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - TROUFION - Graton",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/295.json b/data/json/SingleObtainableItemListDefinition/295.json
index 15de717deb8110b88973cdb0fbf0951f1f96978c..4f616d3450ff1088b5fe5baf14fb0b0a59535dba 100644
--- a/data/json/SingleObtainableItemListDefinition/295.json
+++ b/data/json/SingleObtainableItemListDefinition/295.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 434
+          "typeEnum": 25,
+          "value": 66687
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Jon Kriz",
+  "m_displayName": "MONSTRES - COCHON - SORTS - BOSS - Jon Kriz",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/297.json b/data/json/SingleObtainableItemListDefinition/297.json
deleted file mode 100644
index 3add61589cd559287d8805c59cc1bba6da95e165..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/297.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "297",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 297,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 483
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 339
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Chafer - 6",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/298.json b/data/json/SingleObtainableItemListDefinition/298.json
index 10070edc921cc3d598a606dd9f4f21b52dbfb48d..a69377325f40f250cf769f061279323ee726b85e 100644
--- a/data/json/SingleObtainableItemListDefinition/298.json
+++ b/data/json/SingleObtainableItemListDefinition/298.json
@@ -187,6 +187,6 @@
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Trouffion",
+  "m_displayName": "MONSTRES - FRAGMENTS - TROUFION",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/301.json b/data/json/SingleObtainableItemListDefinition/301.json
index 24f3133a604d1000c8b505f4a5cc40ae4d46585f..d2fc172de6e0bd1e525479a2c0c8098e0a0e319a 100644
--- a/data/json/SingleObtainableItemListDefinition/301.json
+++ b/data/json/SingleObtainableItemListDefinition/301.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 282
+          "typeEnum": 25,
+          "value": 256
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Empereur Guemene",
+  "m_displayName": "MONSTRES - COCHON - SORTS - BOSS - Empereur Guemene",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/305.json b/data/json/SingleObtainableItemListDefinition/305.json
deleted file mode 100644
index dae480c87e16f398a9ba3dff3da08b7edc4a1b4e..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/305.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "305",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 305,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 561
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 401
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 276
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Chafer - 7+",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/308.json b/data/json/SingleObtainableItemListDefinition/308.json
index d896dfde9b38e4a7ceee579ef1d03d82301bcfbe..31c9c78e83e3d2c5f37e5d89b4cca7cb382cf9b3 100644
--- a/data/json/SingleObtainableItemListDefinition/308.json
+++ b/data/json/SingleObtainableItemListDefinition/308.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 578
+          "typeEnum": 25,
+          "value": 71387
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Bworkette",
+  "m_displayName": "MONSTRES - BWORK - SORTS - SERGENT - Bworkette",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/319.json b/data/json/SingleObtainableItemListDefinition/319.json
deleted file mode 100644
index 39fc2375ebd2afa715a70036f44fc646bfd50206..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/319.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "319",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 319,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 221
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 32
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 144
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Bwork - 7+",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/333.json b/data/json/SingleObtainableItemListDefinition/333.json
index a1dccb0cce739da16b3ea15ef4ccc2c9328641c5..f754fca58a2fa9fc03e181dd5714a60a2d66da67 100644
--- a/data/json/SingleObtainableItemListDefinition/333.json
+++ b/data/json/SingleObtainableItemListDefinition/333.json
@@ -9,18 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 187
+          "value": 473
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 740
+          "value": 304
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Mortadella",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - SERGENT - Mortadella",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/338.json b/data/json/SingleObtainableItemListDefinition/338.json
index 1b1fa4ed9bebbb1e1efca0165a2c72161db0b435..7ee9e6673cf60435407bc10087137c1b64d44bab 100644
--- a/data/json/SingleObtainableItemListDefinition/338.json
+++ b/data/json/SingleObtainableItemListDefinition/338.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 49
+          "typeEnum": 25,
+          "value": 322
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Blockmort",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - SERGENT - Blockmort",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/371.json b/data/json/SingleObtainableItemListDefinition/371.json
index 96b7e458c531096e3dc563e1e34ed24f9887b9a0..3e03b883a9d2e30d40e7648757afbcdfb946102c 100644
--- a/data/json/SingleObtainableItemListDefinition/371.json
+++ b/data/json/SingleObtainableItemListDefinition/371.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 337
+          "typeEnum": 25,
+          "value": 782
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Patriarche",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - BOSS - Patriarche",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/38.json b/data/json/SingleObtainableItemListDefinition/38.json
index c9448f3af5415e91b546a8d08af41c6048329a23..8a3257f3af218869f3c49a47ff28266af2ea6b00 100644
--- a/data/json/SingleObtainableItemListDefinition/38.json
+++ b/data/json/SingleObtainableItemListDefinition/38.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 619
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 110
+          "value": 514
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Crogneur",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - SERGENT - Crogneur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/393.json b/data/json/SingleObtainableItemListDefinition/393.json
index 09042ebc0e0f06841598980489e8dc5597b16e67..a1e6133f4e3fb59026c1666252bacab96f98e4c3 100644
--- a/data/json/SingleObtainableItemListDefinition/393.json
+++ b/data/json/SingleObtainableItemListDefinition/393.json
@@ -329,6 +329,6 @@
       }
     ]
   },
-  "m_displayName": "Companions (Champions)",
+  "m_displayName": "COMPAGNONS - Champions",
   "m_availability": 2
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/394.json b/data/json/SingleObtainableItemListDefinition/394.json
index eb136bc75b221dbbe989c0a90ee8d13f7ccb5315..bfc141436c5587edb747256f02aa0f0af0e48ecd 100644
--- a/data/json/SingleObtainableItemListDefinition/394.json
+++ b/data/json/SingleObtainableItemListDefinition/394.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 53
+          "typeEnum": 25,
+          "value": 559
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Pinspoteur",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - BOSS - Pinspoteur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/395.json b/data/json/SingleObtainableItemListDefinition/395.json
index c100f5d112d03da1f687cd1c3feeba110e658b63..50a866f375bdfe8f84389413509fcffc9063cf49 100644
--- a/data/json/SingleObtainableItemListDefinition/395.json
+++ b/data/json/SingleObtainableItemListDefinition/395.json
@@ -8,12 +8,19 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 83
+          "typeEnum": 25,
+          "value": 868
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 25,
+          "value": 61009
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Graton",
+  "m_displayName": "MONSTRES - COCHON - SORTS - TROUFION - Graton",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/4.json b/data/json/SingleObtainableItemListDefinition/4.json
index 652074ec6383e917b05bfb42f90b048a36264bfc..cd8a3974c7ee12a49ea0cb031875e28b443d957c 100644
--- a/data/json/SingleObtainableItemListDefinition/4.json
+++ b/data/json/SingleObtainableItemListDefinition/4.json
@@ -16,11 +16,32 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 83
+          "value": 483
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 561
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 401
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 276
         }
       }
     ]
   },
-  "m_displayName": "MARCHANDS - Compagnons - Chafer - 5",
+  "m_displayName": "MARCHANDS - COMPAGNONS - CHAFER - Champions",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/428.json b/data/json/SingleObtainableItemListDefinition/428.json
index 83e7b7565d98cce3e4ba174e3df1012a95acd4b6..302baa8066c883fcf40638605c558317943ed723 100644
--- a/data/json/SingleObtainableItemListDefinition/428.json
+++ b/data/json/SingleObtainableItemListDefinition/428.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 781
+          "typeEnum": 25,
+          "value": 68132
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Parle-Lave",
+  "m_displayName": "MONSTRES - BWORK - SORTS - SERGENT - Parle-Lave",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/430.json b/data/json/SingleObtainableItemListDefinition/430.json
index 5d11aeca9315c13f8dae39d5fa5014632f44fd0b..dbec12898a3ebd9eb2f4ed010bf4d1e3394a98fc 100644
--- a/data/json/SingleObtainableItemListDefinition/430.json
+++ b/data/json/SingleObtainableItemListDefinition/430.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 131
+          "typeEnum": 25,
+          "value": 645
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Bworky Pro Graisse",
+  "m_displayName": "MONSTRES - BWORK - SORTS - BOSS - Bworky Pro Graisse",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/438.json b/data/json/SingleObtainableItemListDefinition/438.json
index 36656b4536767422a7abebb4ec25acc4aa85ae70..58159f37aa27029a2688b375154503429c954080 100644
--- a/data/json/SingleObtainableItemListDefinition/438.json
+++ b/data/json/SingleObtainableItemListDefinition/438.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 146
+          "typeEnum": 25,
+          "value": 243
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Larbin Monté",
+  "m_displayName": "MONSTRES - BWORK - SORTS - TROUFION - Larbin Monté",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/45.json b/data/json/SingleObtainableItemListDefinition/45.json
index c6b95ca3b30b3801f36636ea45ace6d730e0cb12..3ab251ca8edf0917565417fc9109aaa8f258ab53 100644
--- a/data/json/SingleObtainableItemListDefinition/45.json
+++ b/data/json/SingleObtainableItemListDefinition/45.json
@@ -9,88 +9,88 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 645
+          "value": 52
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 433
+          "value": 939
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 765
+          "value": 991
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 369
+          "value": 294
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 665
+          "value": 313
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 847
+          "value": 726
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 731
+          "value": 924
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 508
+          "value": 315
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 757
+          "value": 919
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 928
+          "value": 147
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 541
+          "value": 676
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 192
+          "value": 8
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/456.json b/data/json/SingleObtainableItemListDefinition/456.json
index 55536a00a02f52389f6f7a7d0ef8255aa958973f..74f6b01ae617ac3740e78ee41d028f47a9fddb53 100644
--- a/data/json/SingleObtainableItemListDefinition/456.json
+++ b/data/json/SingleObtainableItemListDefinition/456.json
@@ -13,8 +13,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 50,
-          "max": 80
+          "min": 25,
+          "max": 50
         }
       },
       {
@@ -25,8 +25,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 50,
-          "max": 80
+          "min": 25,
+          "max": 50
         }
       },
       {
@@ -37,8 +37,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 50,
-          "max": 80
+          "min": 25,
+          "max": 50
         }
       },
       {
@@ -49,8 +49,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 50,
-          "max": 80
+          "min": 25,
+          "max": 50
         }
       },
       {
@@ -61,8 +61,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 50,
-          "max": 80
+          "min": 25,
+          "max": 50
         }
       },
       {
@@ -73,8 +73,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 10,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -85,8 +85,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 10,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -97,8 +97,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 10,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -109,8 +109,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 10,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -121,8 +121,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 10,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -187,6 +187,6 @@
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Coffres 21-25",
+  "m_displayName": "COFFRES - FRAGMENTS - Chapitres 21-25",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/470.json b/data/json/SingleObtainableItemListDefinition/470.json
index e325a78d08e266bebce011b0e643dd80cbf690c9..f48d0b4b7e1df32a6e14023888c80dd23b55e80d 100644
--- a/data/json/SingleObtainableItemListDefinition/470.json
+++ b/data/json/SingleObtainableItemListDefinition/470.json
@@ -9,88 +9,88 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 563
+          "value": 555
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 994
+          "value": 466
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 531
+          "value": 28
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 831
+          "value": 986
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 187
+          "value": 109
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 506
+          "value": 742
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 658
+          "value": 641
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 97
+          "value": 132
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 740
+          "value": 116
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 324
+          "value": 473
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 512
+          "value": 304
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 529
+          "value": 960
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/482.json b/data/json/SingleObtainableItemListDefinition/482.json
index 393a373324b2ff5b17114bf17eb8057c6a5b8e5b..7cf6bd1e84c93d987895d4b87892a398b04ec726 100644
--- a/data/json/SingleObtainableItemListDefinition/482.json
+++ b/data/json/SingleObtainableItemListDefinition/482.json
@@ -73,8 +73,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 4,
-          "max": 8
+          "min": 2,
+          "max": 4
         }
       },
       {
@@ -85,8 +85,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 4,
-          "max": 8
+          "min": 2,
+          "max": 4
         }
       },
       {
@@ -97,8 +97,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 4,
-          "max": 8
+          "min": 2,
+          "max": 4
         }
       },
       {
@@ -109,8 +109,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 4,
-          "max": 8
+          "min": 2,
+          "max": 4
         }
       },
       {
@@ -121,8 +121,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 4,
-          "max": 8
+          "min": 2,
+          "max": 4
         }
       },
       {
@@ -187,6 +187,6 @@
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Coffres 6-10",
+  "m_displayName": "COFFRES - FRAGMENTS - Chapitres 06-10",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/495.json b/data/json/SingleObtainableItemListDefinition/495.json
index 825c3666cc6a85a9a99a1f57252a4634c4dc09cb..a2aa3c81cd2a66fd9280657ab48dc88f82f722a4 100644
--- a/data/json/SingleObtainableItemListDefinition/495.json
+++ b/data/json/SingleObtainableItemListDefinition/495.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 563
+          "value": 28
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 555
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Disciple",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - TROUFION - Disciple",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/50.json b/data/json/SingleObtainableItemListDefinition/50.json
index ce0bf41fd2974e6de6847d4feada7ae3ecaa1a39..6884ae1af2d534885ef3201d44fda66e6064452e 100644
--- a/data/json/SingleObtainableItemListDefinition/50.json
+++ b/data/json/SingleObtainableItemListDefinition/50.json
@@ -13,8 +13,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 70,
-          "max": 100
+          "min": 30,
+          "max": 60
         }
       },
       {
@@ -25,8 +25,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 70,
-          "max": 100
+          "min": 30,
+          "max": 60
         }
       },
       {
@@ -37,8 +37,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 70,
-          "max": 100
+          "min": 30,
+          "max": 60
         }
       },
       {
@@ -49,8 +49,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 70,
-          "max": 100
+          "min": 30,
+          "max": 60
         }
       },
       {
@@ -61,8 +61,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 70,
-          "max": 100
+          "min": 30,
+          "max": 60
         }
       },
       {
@@ -73,8 +73,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 12,
-          "max": 18
+          "min": 6,
+          "max": 12
         }
       },
       {
@@ -85,8 +85,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 12,
-          "max": 18
+          "min": 6,
+          "max": 12
         }
       },
       {
@@ -97,8 +97,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 12,
-          "max": 18
+          "min": 6,
+          "max": 12
         }
       },
       {
@@ -109,8 +109,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 12,
-          "max": 18
+          "min": 6,
+          "max": 12
         }
       },
       {
@@ -121,8 +121,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 12,
-          "max": 18
+          "min": 6,
+          "max": 12
         }
       },
       {
@@ -133,8 +133,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 1,
-          "max": 2
+          "min": 2,
+          "max": 3
         }
       },
       {
@@ -145,8 +145,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 1,
-          "max": 2
+          "min": 2,
+          "max": 3
         }
       },
       {
@@ -157,8 +157,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 1,
-          "max": 2
+          "min": 2,
+          "max": 3
         }
       },
       {
@@ -169,8 +169,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 1,
-          "max": 2
+          "min": 2,
+          "max": 3
         }
       },
       {
@@ -181,12 +181,12 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 1,
-          "max": 2
+          "min": 2,
+          "max": 3
         }
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Coffres 26-30",
+  "m_displayName": "COFFRES - FRAGMENTS - Chapitres 26-30",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/500.json b/data/json/SingleObtainableItemListDefinition/500.json
deleted file mode 100644
index de687699edf4e3d4d02fbe28ff9f2a30e3b80253..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/500.json
+++ /dev/null
@@ -1,474 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "500",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 500,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 133
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 878
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 127
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 580
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 137
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 768
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 425
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 69
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 131
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 146
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 404
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 440
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 545
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 790
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 35
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 180
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 195
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 253
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 343
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 866
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 915
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 5
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 145
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 191
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 382
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 405
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 734
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 957
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 22
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 248
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 760
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 451
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 49
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 282
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 547
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 713
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 434
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 159
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 452
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 411
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 764
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 783
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 943
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 15
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 328
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 991
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 524
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 597
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 698
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 361
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 357
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 12
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 511
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 232
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 966
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 611
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 371
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 324
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 578
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 387
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 83
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 781
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 53
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 601
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 934
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 337
-        }
-      }
-    ]
-  },
-  "m_displayName": "Gem Loot Table",
-  "m_availability": 2
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/502.json b/data/json/SingleObtainableItemListDefinition/502.json
index e16ddafeff8c4e414a360ea3403ad1d7f1dee77e..0be6ef8d228b9d83b96288a7cec49843b7bf7c7e 100644
--- a/data/json/SingleObtainableItemListDefinition/502.json
+++ b/data/json/SingleObtainableItemListDefinition/502.json
@@ -9,25 +9,60 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 819
+          "value": 966
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 966
+          "value": 492
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 492
+          "value": 229
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 792
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 188
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 845
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 568
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 745
         }
       }
     ]
   },
-  "m_displayName": "MARCHANDS - Compagnons - Chafer - 3",
+  "m_displayName": "MARCHANDS - COMPAGNONS - CHAFER - Soldats",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/504.json b/data/json/SingleObtainableItemListDefinition/504.json
index 88677c950242857eec47e39dee8ea2de90256394..887f2eabeb850dafe523af9ae1dc3cb7a08ae85c 100644
--- a/data/json/SingleObtainableItemListDefinition/504.json
+++ b/data/json/SingleObtainableItemListDefinition/504.json
@@ -9,18 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 831
+          "value": 116
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 97
+          "value": 641
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Instructeur",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - SERGENT - Instructeur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/536.json b/data/json/SingleObtainableItemListDefinition/536.json
index 086f7c24b6aef8102f4033e780a77475b2b87bf0..eb78033c35eb0327caac72ff53e05df1e7a1c8d3 100644
--- a/data/json/SingleObtainableItemListDefinition/536.json
+++ b/data/json/SingleObtainableItemListDefinition/536.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 611
+          "typeEnum": 25,
+          "value": 68622
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Chatreuse",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - SERGENT - Chatreuse",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/541.json b/data/json/SingleObtainableItemListDefinition/541.json
index e4f9e1f25dfee9d55953cc0edbd0d76fcfe5f9c6..c3ddfb76496201a524d78b645b556184eee12a4e 100644
--- a/data/json/SingleObtainableItemListDefinition/541.json
+++ b/data/json/SingleObtainableItemListDefinition/541.json
@@ -9,18 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 888
+          "value": 914
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 539
+          "value": 967
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Chatreuse",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - SERGENT - Chatreuse",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/548.json b/data/json/SingleObtainableItemListDefinition/548.json
index 25615f64082e57a5f10afd040c4e98d5d3e8d861..66ad31a78393c3a64370ac5fc989e4e95cf62bf9 100644
--- a/data/json/SingleObtainableItemListDefinition/548.json
+++ b/data/json/SingleObtainableItemListDefinition/548.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 658
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 512
+          "value": 960
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Coppa",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - SERGENT - Coppa",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/59.json b/data/json/SingleObtainableItemListDefinition/59.json
index 3462a402e296fb691abf5842c72b61789d166675..7508e2b88780eaef80e4209481b0e5261e29b67d 100644
--- a/data/json/SingleObtainableItemListDefinition/59.json
+++ b/data/json/SingleObtainableItemListDefinition/59.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 934
+          "typeEnum": 25,
+          "value": 898
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Instructeur",
+  "m_displayName": "MONSTRES - COCHON - SORTS - SERGENT - Instructeur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/598.json b/data/json/SingleObtainableItemListDefinition/598.json
index b9e7606b9dd196ae3baa09d7382123d9fec2da33..8eeee60de105717753e2556c39b3668f10755181 100644
--- a/data/json/SingleObtainableItemListDefinition/598.json
+++ b/data/json/SingleObtainableItemListDefinition/598.json
@@ -187,6 +187,6 @@
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Sergent",
+  "m_displayName": "MONSTRES - FRAGMENTS - SERGENTS",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/604.json b/data/json/SingleObtainableItemListDefinition/604.json
index 5f3a1168d089e7771da9a8fc77e5fadebfacf3a9..89bd2ee4dc88db14c96660a7e0c2daf28c7af4a4 100644
--- a/data/json/SingleObtainableItemListDefinition/604.json
+++ b/data/json/SingleObtainableItemListDefinition/604.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 550
+          "value": 610
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 652
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Arbatarba",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - TROUFION - Arbatarba",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/611.json b/data/json/SingleObtainableItemListDefinition/611.json
index f77da64936ffd32ab99b936f911869f90b9e9993..7e4c97ba23f0d8512655c58489968c6f31a0be2c 100644
--- a/data/json/SingleObtainableItemListDefinition/611.json
+++ b/data/json/SingleObtainableItemListDefinition/611.json
@@ -16,18 +16,53 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 633
+          "value": 657
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 657
+          "value": 628
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 42
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 188
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 845
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 568
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 745
         }
       }
     ]
   },
-  "m_displayName": "MARCHANDS - Compagnons - Cochon - 3",
+  "m_displayName": "MARCHANDS - COMPAGNONS - COCHON - Soldats",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/612.json b/data/json/SingleObtainableItemListDefinition/612.json
deleted file mode 100644
index 9f4c54283b0c26cc89dde6c7f04f024cc4cbbf1c..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/612.json
+++ /dev/null
@@ -1,257 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "612",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 612,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 32
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 58
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 157
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 187
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 200
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 369
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 389
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 508
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 531
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 541
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 567
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 645
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 733
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 847
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 907
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 909
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 978
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 426
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 928
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 475
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 569
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 529
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 192
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 773
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 658
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 39
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 619
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 506
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 324
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 580
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 731
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 512
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 97
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 757
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 539
-        }
-      }
-    ]
-  },
-  "m_displayName": "Ring Loot Table",
-  "m_availability": 2
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/618.json b/data/json/SingleObtainableItemListDefinition/618.json
index e45f45029d056939f7e57ba1949e2fc388520926..ce92b41e0235598ee94dcf512d6fbbafb9902a0e 100644
--- a/data/json/SingleObtainableItemListDefinition/618.json
+++ b/data/json/SingleObtainableItemListDefinition/618.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 411
+          "typeEnum": 25,
+          "value": 812
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Larbin",
+  "m_displayName": "MONSTRES - BWORK - SORTS - TROUFION - Larbin",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/62.json b/data/json/SingleObtainableItemListDefinition/62.json
index 1e35e558b9ad56169a033293e4145e3098ba7fa4..09c2b7abefae253e805112f288be7809bffbec8c 100644
--- a/data/json/SingleObtainableItemListDefinition/62.json
+++ b/data/json/SingleObtainableItemListDefinition/62.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 531
+          "value": 109
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 742
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Soldat Tripoux",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - TROUFION - Soldat Tripoux",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/621.json b/data/json/SingleObtainableItemListDefinition/621.json
index ed61253149d5ecb01ff214022e8d79a44e0d75ba..8ed20c7769a14f7f2ca374daa0531f8e35a3584e 100644
--- a/data/json/SingleObtainableItemListDefinition/621.json
+++ b/data/json/SingleObtainableItemListDefinition/621.json
@@ -16,11 +16,32 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 52
+          "value": 666
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 221
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 32
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 144
         }
       }
     ]
   },
-  "m_displayName": "MARCHANDS - Compagnons - Bwork - 5",
+  "m_displayName": "MARCHANDS - COMPAGNONS - BWORK - Champions",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/638.json b/data/json/SingleObtainableItemListDefinition/638.json
deleted file mode 100644
index 6556ea3bf6a2c00fb459803b1e25b7a8fe0222d8..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/638.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "638",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 638,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 180
-        }
-      }
-    ]
-  },
-  "m_displayName": "CHAFER - Gemmes - Ossuaire Funeste",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/644.json b/data/json/SingleObtainableItemListDefinition/644.json
index 597dc5f55adf7e6ca13196882f7dd6e897d64dd0..aeed03ffa1ba7b0a04d298525c4eafb032c3bdda 100644
--- a/data/json/SingleObtainableItemListDefinition/644.json
+++ b/data/json/SingleObtainableItemListDefinition/644.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 369
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 508
+          "value": 676
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Bworkette",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - SERGENT - Bworkette",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/659.json b/data/json/SingleObtainableItemListDefinition/659.json
index a9444d4af237da9f2144177eae54b5408a07785b..f63b15c91f318f9d882540f1b5e54f4cad9882d2 100644
--- a/data/json/SingleObtainableItemListDefinition/659.json
+++ b/data/json/SingleObtainableItemListDefinition/659.json
@@ -252,6 +252,6 @@
       }
     ]
   },
-  "m_displayName": "Skins (Weapons)",
+  "m_displayName": "SKINS - Weapons",
   "m_availability": 2
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/669.json b/data/json/SingleObtainableItemListDefinition/669.json
deleted file mode 100644
index d12a779af4a9e65cf816b61834c21f59ec6b9885..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/669.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "669",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 669,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 666
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 664
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Bwork - 6",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/683.json b/data/json/SingleObtainableItemListDefinition/683.json
index 08178efe3f74e4788b273edffd53eda47fd2ee01..22b2fedfe2315288fe09372ed8a324f531c79eb9 100644
--- a/data/json/SingleObtainableItemListDefinition/683.json
+++ b/data/json/SingleObtainableItemListDefinition/683.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 734
+          "typeEnum": 25,
+          "value": 65910
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Coppa",
+  "m_displayName": "MONSTRES - COCHON - SORTS - SERGENT - Coppa",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/687.json b/data/json/SingleObtainableItemListDefinition/687.json
index 1ed61305032128f304d610a151d5b818faffda06..9af7e83c381b0941b272cec161e4c2c78fe6533e 100644
--- a/data/json/SingleObtainableItemListDefinition/687.json
+++ b/data/json/SingleObtainableItemListDefinition/687.json
@@ -8,61 +8,61 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 957
+          "typeEnum": 25,
+          "value": 816
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 83
+          "typeEnum": 25,
+          "value": 11
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 451
+          "typeEnum": 25,
+          "value": 61009
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 934
+          "typeEnum": 25,
+          "value": 868
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 580
+          "typeEnum": 25,
+          "value": 65910
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 783
+          "typeEnum": 25,
+          "value": 898
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 734
+          "typeEnum": 25,
+          "value": 64
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 943
+          "typeEnum": 25,
+          "value": 66464
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes",
+  "m_displayName": "MONSTRES - COCHON - SORTS",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/694.json b/data/json/SingleObtainableItemListDefinition/694.json
index d7391e144a429ee9c2a1791e5fa9df29c88d7759..36ec2347a85a71d6d1bee26b35b26b6757169833 100644
--- a/data/json/SingleObtainableItemListDefinition/694.json
+++ b/data/json/SingleObtainableItemListDefinition/694.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 907
+          "value": 204
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 576
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Proctoss",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - TROUFION - Proctoss",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/71.json b/data/json/SingleObtainableItemListDefinition/71.json
index 191b736c64af32e28d57123e5fbb20e39d51c61b..df82d54fa18bbdca5eea0788fd4076a2dab08e2e 100644
--- a/data/json/SingleObtainableItemListDefinition/71.json
+++ b/data/json/SingleObtainableItemListDefinition/71.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 731
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 541
+          "value": 919
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Bworkokak",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - SERGENT - Bworkokak",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/717.json b/data/json/SingleObtainableItemListDefinition/717.json
index 5bc4fff7e07cb6efa8f267fbcc3e8f96d5c6eba8..21b5733fb4e752691f3dc56b3920453f0fb964e0 100644
--- a/data/json/SingleObtainableItemListDefinition/717.json
+++ b/data/json/SingleObtainableItemListDefinition/717.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 506
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 324
+          "value": 132
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Anneaux - Guerrier Boudeur",
+  "m_displayName": "MONSTRES - COCHON - ANNEAUX - SERGENT - Guerrier Boudeur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/719.json b/data/json/SingleObtainableItemListDefinition/719.json
index 45ce17eef26282fa559fc89430b3397026f72519..4ddf4c791c7aea04ba25d787695e853fd3dde5dd 100644
--- a/data/json/SingleObtainableItemListDefinition/719.json
+++ b/data/json/SingleObtainableItemListDefinition/719.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 343
+          "typeEnum": 25,
+          "value": 276
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Chef du Clan",
+  "m_displayName": "MONSTRES - BWORK - SORTS - BOSS - Chef du Clan",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/721.json b/data/json/SingleObtainableItemListDefinition/721.json
deleted file mode 100644
index 1cba00b44dd90efc4a5abc5411da46e4138378df..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/721.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "721",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 721,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 229
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 642
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 792
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Chafer - 4",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/728.json b/data/json/SingleObtainableItemListDefinition/728.json
index df500a7f6f778fb1a08b4aaf0cb750581148c9a1..61ad4ba98fa2dd2e5a0f5018ad56e271eab935f4 100644
--- a/data/json/SingleObtainableItemListDefinition/728.json
+++ b/data/json/SingleObtainableItemListDefinition/728.json
@@ -462,6 +462,6 @@
       }
     ]
   },
-  "m_displayName": "Companions (Soldiers)",
+  "m_displayName": "COMPAGNONS - Soldats",
   "m_availability": 2
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/740.json b/data/json/SingleObtainableItemListDefinition/740.json
deleted file mode 100644
index e9cf77115f47b17f01e51dbf543a2d4a2f4c3c1a..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/740.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "740",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 740,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 389
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 884
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 58
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 200
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 392
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 805
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 130
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 773
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 978
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 32
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 109
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 580
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 909
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 733
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 426
-        }
-      }
-    ]
-  },
-  "m_displayName": "MONSTRES - Anneaux",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/750.json b/data/json/SingleObtainableItemListDefinition/750.json
index a5c6e94062648029c18c17db6e1b272832aac63e..e3d7a1269d734686db06ac586dae97f495f8a2f3 100644
--- a/data/json/SingleObtainableItemListDefinition/750.json
+++ b/data/json/SingleObtainableItemListDefinition/750.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 645
+          "value": 939
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 52
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Larbin",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - TROUFION - Larbin",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/755.json b/data/json/SingleObtainableItemListDefinition/755.json
index 474311bb938c664db1d094b34f93f389296fb519..1ef5dbf229c6209c84cec7c07443424fa8171507 100644
--- a/data/json/SingleObtainableItemListDefinition/755.json
+++ b/data/json/SingleObtainableItemListDefinition/755.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 433
+          "value": 294
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 726
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Larbin Monté",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - TROUFION - Larbin Monté",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/759.json b/data/json/SingleObtainableItemListDefinition/759.json
index 539e1fa1c6e0a6e262c3488a5b2519cc32ada063..2b1875c69f492edaa9089bf6421af593f47bfe56 100644
--- a/data/json/SingleObtainableItemListDefinition/759.json
+++ b/data/json/SingleObtainableItemListDefinition/759.json
@@ -13,8 +13,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 20,
-          "max": 40
+          "min": 15,
+          "max": 30
         }
       },
       {
@@ -25,8 +25,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 20,
-          "max": 40
+          "min": 15,
+          "max": 30
         }
       },
       {
@@ -37,8 +37,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 20,
-          "max": 40
+          "min": 15,
+          "max": 30
         }
       },
       {
@@ -49,8 +49,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 20,
-          "max": 40
+          "min": 15,
+          "max": 30
         }
       },
       {
@@ -61,8 +61,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 20,
-          "max": 40
+          "min": 15,
+          "max": 30
         }
       },
       {
@@ -73,8 +73,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 6,
-          "max": 10
+          "min": 3,
+          "max": 6
         }
       },
       {
@@ -85,8 +85,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 6,
-          "max": 10
+          "min": 3,
+          "max": 6
         }
       },
       {
@@ -97,8 +97,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 6,
-          "max": 10
+          "min": 3,
+          "max": 6
         }
       },
       {
@@ -109,8 +109,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 6,
-          "max": 10
+          "min": 3,
+          "max": 6
         }
       },
       {
@@ -121,8 +121,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 6,
-          "max": 10
+          "min": 3,
+          "max": 6
         }
       },
       {
@@ -134,7 +134,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -146,7 +146,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -158,7 +158,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -170,7 +170,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -182,11 +182,11 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Coffres 11-15",
+  "m_displayName": "COFFRES - FRAGMENTS - Chapitres 11-15",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/760.json b/data/json/SingleObtainableItemListDefinition/760.json
index afd8bff367748bbc08c96301bc8731c3416b3cba..a7ea851d4442a4d74205a70ac9a7824d518444d0 100644
--- a/data/json/SingleObtainableItemListDefinition/760.json
+++ b/data/json/SingleObtainableItemListDefinition/760.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 451
+          "typeEnum": 25,
+          "value": 66464
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Soldat Tripoux",
+  "m_displayName": "MONSTRES - COCHON - SORTS - TROUFION - Soldat Tripoux",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/762.json b/data/json/SingleObtainableItemListDefinition/762.json
index 1dd418b54da6169b8c376b7738fa6a8b5d2881d8..d3955b23aec58457c8e2bfb3f734c7ac4acf252a 100644
--- a/data/json/SingleObtainableItemListDefinition/762.json
+++ b/data/json/SingleObtainableItemListDefinition/762.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 157
+          "value": 170
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 250
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Anneaux - Picoss",
+  "m_displayName": "MONSTRES - CHAFER - ANNEAUX - TROUFION - Picoss",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/765.json b/data/json/SingleObtainableItemListDefinition/765.json
index 53244f299119d05100fb00a0413b19da6232898b..11e7399a468b286982c68dd67f066de7f6dae39e 100644
--- a/data/json/SingleObtainableItemListDefinition/765.json
+++ b/data/json/SingleObtainableItemListDefinition/765.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 324
+          "typeEnum": 25,
+          "value": 590
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Traqueur",
+  "m_displayName": "MONSTRES - BWORK - SORTS - TROUFION - Traqueur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/789.json b/data/json/SingleObtainableItemListDefinition/789.json
index 22478e821820a1081b1d830db438350c67def28f..6940e29da4e10e6773d07ba7190629630d92e73d 100644
--- a/data/json/SingleObtainableItemListDefinition/789.json
+++ b/data/json/SingleObtainableItemListDefinition/789.json
@@ -16,11 +16,32 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 72
+          "value": 98
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 847
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 135
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 661
         }
       }
     ]
   },
-  "m_displayName": "MARCHANDS - Compagnons - Cochon - 5",
+  "m_displayName": "MARCHANDS - COMPAGNONS - COCHON - Champions",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/791.json b/data/json/SingleObtainableItemListDefinition/791.json
index c4e25481a7b08d0fb407ad721b5c76a41d40199f..315c0e279aa66a932a8033fafa323e60f5998d4e 100644
--- a/data/json/SingleObtainableItemListDefinition/791.json
+++ b/data/json/SingleObtainableItemListDefinition/791.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 580
+          "typeEnum": 25,
+          "value": 64
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Mortadella",
+  "m_displayName": "MONSTRES - COCHON - SORTS - SERGENT - Mortadella",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/804.json b/data/json/SingleObtainableItemListDefinition/804.json
index 81c78bb06de658358869923d3aec1185ef1fc02a..861691e7da09638a35580446760849b7e519ab5c 100644
--- a/data/json/SingleObtainableItemListDefinition/804.json
+++ b/data/json/SingleObtainableItemListDefinition/804.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 783
+          "typeEnum": 25,
+          "value": 65910
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Guerrier Boudeur",
+  "m_displayName": "MONSTRES - COCHON - SORTS - SERGENT - Guerrier Boudeur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/823.json b/data/json/SingleObtainableItemListDefinition/823.json
index db9598a2e2b1119bedc9beb7c809dda360b69706..97abd031ad755097d9e3ec3bb0642902ffe73cfb 100644
--- a/data/json/SingleObtainableItemListDefinition/823.json
+++ b/data/json/SingleObtainableItemListDefinition/823.json
@@ -9,11 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 765
+          "value": 991
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 32,
+          "value": 313
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Traqueur",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - TROUFION - Traqueur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/83.json b/data/json/SingleObtainableItemListDefinition/83.json
deleted file mode 100644
index 0d37eaa96a0977eca767cce5ac65e9fad2005c07..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/83.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "83",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 83,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 628
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 42
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 933
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Cochon - 4",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/831.json b/data/json/SingleObtainableItemListDefinition/831.json
deleted file mode 100644
index 0e3d6f9b24e02276122caaff6beb4adaefefd8c3..0000000000000000000000000000000000000000
--- a/data/json/SingleObtainableItemListDefinition/831.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "831",
-  "m_jsonRepresentation": {
-    "type": "SingleObtainableItemListDefinition",
-    "id": 831,
-    "items": [
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 807
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 389
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 5,
-          "value": 835
-        }
-      }
-    ]
-  },
-  "m_displayName": "MARCHANDS - Compagnons - Bwork - 4",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/832.json b/data/json/SingleObtainableItemListDefinition/832.json
index f0943de3822f4c6c350857f2747f17da71b6d10f..923b39fb55083eb003ba8bfdc4045a1bdc9a1f8f 100644
--- a/data/json/SingleObtainableItemListDefinition/832.json
+++ b/data/json/SingleObtainableItemListDefinition/832.json
@@ -9,18 +9,18 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 847
+          "value": 315
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 928
+          "value": 924
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Gro Bwork",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - SERGENT - Gro Bwork",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/840.json b/data/json/SingleObtainableItemListDefinition/840.json
index d3487da531222cd76fa0834d2f0ab619b9c430bf..3e3f9577b54a7d512f72edda91b8dfef04495d94 100644
--- a/data/json/SingleObtainableItemListDefinition/840.json
+++ b/data/json/SingleObtainableItemListDefinition/840.json
@@ -203,6 +203,6 @@
       }
     ]
   },
-  "m_displayName": "Weapons",
+  "m_displayName": "WEAPONS",
   "m_availability": 2
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/842.json b/data/json/SingleObtainableItemListDefinition/842.json
index 0155281879fc55aa4d51d5dcc53915f1b8071476..369d8149423cb089e8c2bf03b949cef77377d8a0 100644
--- a/data/json/SingleObtainableItemListDefinition/842.json
+++ b/data/json/SingleObtainableItemListDefinition/842.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 452
+          "typeEnum": 25,
+          "value": 528
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Bworkokak",
+  "m_displayName": "MONSTRES - BWORK - SORTS - SERGENT - Bworkokak",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/85.json b/data/json/SingleObtainableItemListDefinition/85.json
index a1c29430f4a02ed1db349e5c54203573351a5dc8..501af8338ad61a780c6c817225727a5cdfc8af04 100644
--- a/data/json/SingleObtainableItemListDefinition/85.json
+++ b/data/json/SingleObtainableItemListDefinition/85.json
@@ -9,25 +9,60 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 753
+          "value": 61
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 61
+          "value": 897
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 5,
-          "value": 897
+          "value": 389
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 835
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 188
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 845
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 568
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 5,
+          "value": 745
         }
       }
     ]
   },
-  "m_displayName": "MARCHANDS - Compagnons - Bwork - 3",
+  "m_displayName": "MARCHANDS - COMPAGNONS - BWORK - Soldats",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/875.json b/data/json/SingleObtainableItemListDefinition/875.json
index f439f8dfc099789381117702284d019fcabc5ff5..8825e1bba2c570aca9c48d52bbfa2116b2c8059e 100644
--- a/data/json/SingleObtainableItemListDefinition/875.json
+++ b/data/json/SingleObtainableItemListDefinition/875.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 440
+          "typeEnum": 25,
+          "value": 70738
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Crogneur",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - SERGENT - Crogneur",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/882.json b/data/json/SingleObtainableItemListDefinition/882.json
index df967cef7f3ce7ba249f985d21ca9d92d197e42e..4701547e3cf58048998075455828d577e5c1cd8b 100644
--- a/data/json/SingleObtainableItemListDefinition/882.json
+++ b/data/json/SingleObtainableItemListDefinition/882.json
@@ -9,18 +9,11 @@
         "type": "OwnableItemInfo",
         "ownableId": {
           "typeEnum": 32,
-          "value": 665
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 32,
-          "value": 757
+          "value": 8
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Anneaux - Parle-Lave",
+  "m_displayName": "MONSTRES - BWORK - ANNEAUX - SERGENT - Parle-Lave",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/890.json b/data/json/SingleObtainableItemListDefinition/890.json
index 35f492d7307dc33df20e3b025c2544d15dda8565..877c4991dee3e6714ef0c42e04c90356e5b5241c 100644
--- a/data/json/SingleObtainableItemListDefinition/890.json
+++ b/data/json/SingleObtainableItemListDefinition/890.json
@@ -13,8 +13,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 7,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -25,8 +25,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 7,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -37,8 +37,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 7,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -49,8 +49,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 7,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -61,8 +61,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 7,
-          "max": 15
+          "min": 5,
+          "max": 10
         }
       },
       {
@@ -73,8 +73,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 2,
-          "max": 5
+          "min": 1,
+          "max": 2
         }
       },
       {
@@ -85,8 +85,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 2,
-          "max": 5
+          "min": 1,
+          "max": 2
         }
       },
       {
@@ -97,8 +97,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 2,
-          "max": 5
+          "min": 1,
+          "max": 2
         }
       },
       {
@@ -109,8 +109,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 2,
-          "max": 5
+          "min": 1,
+          "max": 2
         }
       },
       {
@@ -121,8 +121,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 2,
-          "max": 5
+          "min": 1,
+          "max": 2
         }
       },
       {
@@ -187,6 +187,6 @@
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Coffres 1-5",
+  "m_displayName": "COFFRES - FRAGMENTS - Chapitres 01-05",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/904.json b/data/json/SingleObtainableItemListDefinition/904.json
index f07336455e1c726d4e97933d20734ef1267c8405..a7a89ed6ef0e2e3a62cf42f3dfd728116fad3f4a 100644
--- a/data/json/SingleObtainableItemListDefinition/904.json
+++ b/data/json/SingleObtainableItemListDefinition/904.json
@@ -8,12 +8,19 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 547
+          "typeEnum": 25,
+          "value": 128
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 25,
+          "value": 61533
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Picoss",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - TROUFION - Picoss",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/905.json b/data/json/SingleObtainableItemListDefinition/905.json
index 0b570de2cf52ba6b1f81e38b5550e64985dbc442..42c0d8a37d2847fc41aa6d658bd23249c18db9fd 100644
--- a/data/json/SingleObtainableItemListDefinition/905.json
+++ b/data/json/SingleObtainableItemListDefinition/905.json
@@ -8,68 +8,68 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 601
+          "typeEnum": 25,
+          "value": 406
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 547
+          "typeEnum": 25,
+          "value": 197
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 866
+          "typeEnum": 25,
+          "value": 322
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 49
+          "typeEnum": 25,
+          "value": 68622
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 611
+          "typeEnum": 25,
+          "value": 70738
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 440
+          "typeEnum": 25,
+          "value": 493
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 195
+          "typeEnum": 25,
+          "value": 61533
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 180
+          "typeEnum": 25,
+          "value": 128
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 371
+          "typeEnum": 25,
+          "value": 60215
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes",
+  "m_displayName": "MONSTRES - CHAFER - SORTS",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/911.json b/data/json/SingleObtainableItemListDefinition/911.json
index 8c9f999f55b6d8096fd3dc7dae92f892c7c0ca80..e2f67aeed9d00155ba7e06ed9b6e973f8325a370 100644
--- a/data/json/SingleObtainableItemListDefinition/911.json
+++ b/data/json/SingleObtainableItemListDefinition/911.json
@@ -8,12 +8,19 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 957
+          "typeEnum": 25,
+          "value": 11
+        }
+      },
+      {
+        "type": "OwnableItemInfo",
+        "ownableId": {
+          "typeEnum": 25,
+          "value": 816
         }
       }
     ]
   },
-  "m_displayName": "COCHON - Gemmes - Disciple",
+  "m_displayName": "MONSTRES - COCHON - SORTS - TROUFION - Disciple",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/933.json b/data/json/SingleObtainableItemListDefinition/933.json
index 61041d4e87c837440742ca911b74c53cbaa16625..1513a076fe8d96cf311e80ea78ea6ecd54ea12ca 100644
--- a/data/json/SingleObtainableItemListDefinition/933.json
+++ b/data/json/SingleObtainableItemListDefinition/933.json
@@ -13,8 +13,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 30,
-          "max": 60
+          "min": 20,
+          "max": 40
         }
       },
       {
@@ -25,8 +25,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 30,
-          "max": 60
+          "min": 20,
+          "max": 40
         }
       },
       {
@@ -37,8 +37,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 30,
-          "max": 60
+          "min": 20,
+          "max": 40
         }
       },
       {
@@ -49,8 +49,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 30,
-          "max": 60
+          "min": 20,
+          "max": 40
         }
       },
       {
@@ -61,8 +61,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 30,
-          "max": 60
+          "min": 20,
+          "max": 40
         }
       },
       {
@@ -73,8 +73,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 8,
-          "max": 12
+          "min": 4,
+          "max": 8
         }
       },
       {
@@ -85,8 +85,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 8,
-          "max": 12
+          "min": 4,
+          "max": 8
         }
       },
       {
@@ -97,8 +97,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 8,
-          "max": 12
+          "min": 4,
+          "max": 8
         }
       },
       {
@@ -109,8 +109,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 8,
-          "max": 12
+          "min": 4,
+          "max": 8
         }
       },
       {
@@ -121,8 +121,8 @@
         },
         "count": {
           "type": "MinMax",
-          "min": 8,
-          "max": 12
+          "min": 4,
+          "max": 8
         }
       },
       {
@@ -134,7 +134,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -146,7 +146,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -158,7 +158,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -170,7 +170,7 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       },
       {
@@ -182,11 +182,11 @@
         "count": {
           "type": "MinMax",
           "min": 1,
-          "max": 1
+          "max": 2
         }
       }
     ]
   },
-  "m_displayName": "FRAGMENTS - Coffres 16-20",
+  "m_displayName": "COFFRES - FRAGMENTS - Chapitres 16-20",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/96.json b/data/json/SingleObtainableItemListDefinition/96.json
index a8dd149381eb8715ccc70ec9d38ff033f30c8d1e..c740aa57c7a6f232b2105ebb8b3554183d17d87a 100644
--- a/data/json/SingleObtainableItemListDefinition/96.json
+++ b/data/json/SingleObtainableItemListDefinition/96.json
@@ -8,61 +8,54 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 411
+          "typeEnum": 25,
+          "value": 528
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 146
+          "typeEnum": 25,
+          "value": 71387
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 324
+          "typeEnum": 25,
+          "value": 68796
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 578
+          "typeEnum": 25,
+          "value": 812
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 781
+          "typeEnum": 25,
+          "value": 243
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 713
+          "typeEnum": 25,
+          "value": 68132
         }
       },
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 452
-        }
-      },
-      {
-        "type": "OwnableItemInfo",
-        "ownableId": {
-          "typeEnum": 33,
-          "value": 425
+          "typeEnum": 25,
+          "value": 590
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes",
+  "m_displayName": "MONSTRES - BWORK - SORTS",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/965.json b/data/json/SingleObtainableItemListDefinition/965.json
index 5f5e4a2a6c0721fd6ee04338d7cedc12dd01f1e3..f6842c5147ca6bcc249b0ca78b0861a6358bf73d 100644
--- a/data/json/SingleObtainableItemListDefinition/965.json
+++ b/data/json/SingleObtainableItemListDefinition/965.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 452
+          "typeEnum": 25,
+          "value": 528
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Bworkakorn",
+  "m_displayName": "MONSTRES - BWORK - SORTS - SERGENT - Bworkakorn",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/980.json b/data/json/SingleObtainableItemListDefinition/980.json
index e7aee7f45c7bea1dbc4594662c04d2c4627183c1..efdbf6cb2dbe49f72538b786821e13eb2cfdb7f8 100644
--- a/data/json/SingleObtainableItemListDefinition/980.json
+++ b/data/json/SingleObtainableItemListDefinition/980.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 866
+          "typeEnum": 25,
+          "value": 60215
         }
       }
     ]
   },
-  "m_displayName": "CHAFER - Gemmes - Proctoss",
+  "m_displayName": "MONSTRES - CHAFER - SORTS - TROUFION - Proctoss",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SingleObtainableItemListDefinition/999.json b/data/json/SingleObtainableItemListDefinition/999.json
index 7af88572f71c0e07ffa85f19b033971d64ee5e30..5636b5024a82bed3033b5ad7b1263e146b0e5727 100644
--- a/data/json/SingleObtainableItemListDefinition/999.json
+++ b/data/json/SingleObtainableItemListDefinition/999.json
@@ -8,12 +8,12 @@
       {
         "type": "OwnableItemInfo",
         "ownableId": {
-          "typeEnum": 33,
-          "value": 191
+          "typeEnum": 25,
+          "value": 362
         }
       }
     ]
   },
-  "m_displayName": "BWORK - Gemmes - Bworkdog",
+  "m_displayName": "MONSTRES - BWORK - SORTS - BOSS - Bworkdog",
   "m_availability": 3
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/100.json b/data/json/SkillDefinition/100.json
index ac5d1cfbf673653258ac1fa87c0f13c4856eb0ef..7702aac08ee5459ac386d3a7f82558ffba290ddc 100644
--- a/data/json/SkillDefinition/100.json
+++ b/data/json/SkillDefinition/100.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 100,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/10002.json b/data/json/SkillDefinition/10002.json
index 5a4b1801b584460b38dcc50e5193e67c0d25b155..ffe06c0a64ef57136d6b23e3ce7710a835064e25 100644
--- a/data/json/SkillDefinition/10002.json
+++ b/data/json/SkillDefinition/10002.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 10002,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/101.json b/data/json/SkillDefinition/101.json
index e6270e7364c6a2fe14031bfceb64e376f90919eb..4d438772d06f253b33c6af834514a64b47321e8a 100644
--- a/data/json/SkillDefinition/101.json
+++ b/data/json/SkillDefinition/101.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 101,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/102.json b/data/json/SkillDefinition/102.json
index 1ed5f2297d644fb3b327d77bd267319baa5c8149..7f19003f0347261d1cce7585898ff38996070586 100644
--- a/data/json/SkillDefinition/102.json
+++ b/data/json/SkillDefinition/102.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 102,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 5
+          "value": -5
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "buffP",
           "baseValue": 0.0,
-          "factor": 1.667
+          "factor": 9.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Synchronisateur Tako - Light 2 - Accumulation Céleste",
diff --git a/data/json/SkillDefinition/103.json b/data/json/SkillDefinition/103.json
index 4c3fb9c26ad47df92c222938057c203182b5a127..ee57db9cbc08b6058d66752e30e12d05399b7ee3 100644
--- a/data/json/SkillDefinition/103.json
+++ b/data/json/SkillDefinition/103.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 103,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 4.33
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.7
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/10361.json b/data/json/SkillDefinition/10361.json
index a1e63748d3de7f4e68e7ea96199d92fb5a1ad5dd..957c78509b8b57904be1686e5c1c4d95e915807a 100644
--- a/data/json/SkillDefinition/10361.json
+++ b/data/json/SkillDefinition/10361.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 10361,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/105.json b/data/json/SkillDefinition/105.json
index fb75f84c813d09dea84e6166963b79926f7e85fc..8e189a9a502b88929bb89f8d434ef5a187a799b4 100644
--- a/data/json/SkillDefinition/105.json
+++ b/data/json/SkillDefinition/105.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 105,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/10578.json b/data/json/SkillDefinition/10578.json
index d03f9c20156b20d3f14ffae931e3fa35a4e286de..7cee51604479fe9577da5fb3f85bc019b4b9736e 100644
--- a/data/json/SkillDefinition/10578.json
+++ b/data/json/SkillDefinition/10578.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 10578,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/107.json b/data/json/SkillDefinition/107.json
index baa3a1bfbed9726084ed453612afd33b136bf443..c1e62617e6357b92e8c41c07f82b46fbd652ba28 100644
--- a/data/json/SkillDefinition/107.json
+++ b/data/json/SkillDefinition/107.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 107,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/10730.json b/data/json/SkillDefinition/10730.json
index bbb945cc3a381c1f11f61b5c8228c94863a1d3d7..ad08b932ab5f8eb282fe13a5f706af27bac0e38a 100644
--- a/data/json/SkillDefinition/10730.json
+++ b/data/json/SkillDefinition/10730.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 10730,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/10745.json b/data/json/SkillDefinition/10745.json
index 3191f6db3a5677b5f37f94f829fff8c25f8aefd2..3a7f6eebd8e66eb38575267f5bbf1cc1029c7024 100644
--- a/data/json/SkillDefinition/10745.json
+++ b/data/json/SkillDefinition/10745.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 10745,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/10828.json b/data/json/SkillDefinition/10828.json
index 26c3e8729f19fce4bc0f4de0811f1e5635d241b6..ed30a5c38a9c71221c0f67ba98d82d0a5cf789cd 100644
--- a/data/json/SkillDefinition/10828.json
+++ b/data/json/SkillDefinition/10828.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/109.json b/data/json/SkillDefinition/109.json
index 68b95a8f0e061004c5e42583fc41c27da0fb385c..abceb22d5cb24b96671a9071de6bf1fd12503a3a 100644
--- a/data/json/SkillDefinition/109.json
+++ b/data/json/SkillDefinition/109.json
@@ -19,7 +19,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -28,7 +31,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/11.json b/data/json/SkillDefinition/11.json
index 1dc7604aa4aa481d2773fdbec92662acd91ba7c3..d13406bca1e2ded4d789107f6ae9aa102f94d7d0 100644
--- a/data/json/SkillDefinition/11.json
+++ b/data/json/SkillDefinition/11.json
@@ -5,37 +5,15 @@
     "type": "SkillDefinition",
     "id": 11,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 30.0
-        },
-        {
-          "type": "PercentageOfValue",
-          "referenceId": "h",
-          "percentage": {
-            "type": "ConstIntegerValue",
-            "referenceId": "percPv",
-            "value": 5
-          },
-          "from": {
-            "type": "EntityCaracValue",
-            "referenceId": "",
-            "entitySelector": {
-              "type": "EffectHolderSelector"
-            },
-            "carac": 32
-          }
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percPv",
-          "value": 5
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -46,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 41748,
   "m_i18nDescriptionId": 24604,
-  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
+  "assetGuid": "aebba4430daec0349b1317221a56a144"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/110.json b/data/json/SkillDefinition/110.json
index 6bd4c739bcb6e3bb0903410da911e7d3dc3a0e00..541fdbc3feca1c8acd259cda1b511d3ac53a92c7 100644
--- a/data/json/SkillDefinition/110.json
+++ b/data/json/SkillDefinition/110.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 110,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/111.json b/data/json/SkillDefinition/111.json
index 5c8310b97e4970107c36b952b6db8d4d7090192b..629c081daed85e5c6ae7b50144d60be5af2d583c 100644
--- a/data/json/SkillDefinition/111.json
+++ b/data/json/SkillDefinition/111.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 111,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/114.json b/data/json/SkillDefinition/114.json
index 2f09d69cd7efddfa8a530adc8243abb43d21afd2..efbda74edb0af3f572498557a72e840603916320 100644
--- a/data/json/SkillDefinition/114.json
+++ b/data/json/SkillDefinition/114.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 114,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "bl",
           "baseValue": 0.0,
-          "factor": 66.67
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/115.json b/data/json/SkillDefinition/115.json
index 745daa5ae4d0fe484260a0f107a8cd59f9643c75..5fc716673896737ab236cbfc6b7882d5e9c757a6 100644
--- a/data/json/SkillDefinition/115.json
+++ b/data/json/SkillDefinition/115.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 115,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/117.json b/data/json/SkillDefinition/117.json
index 7487ed140c83823294cad787bf5818b13e64364d..4fd1b53c246e99f02c3811ad8fae39962daf3fa2 100644
--- a/data/json/SkillDefinition/117.json
+++ b/data/json/SkillDefinition/117.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 117,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/118.json b/data/json/SkillDefinition/118.json
index 2fbe8336f5aa5fe2c7c4b9aedec87df408329677..a6d3a03541e7486eeda9d67bb9055e6c846c7f4f 100644
--- a/data/json/SkillDefinition/118.json
+++ b/data/json/SkillDefinition/118.json
@@ -5,29 +5,24 @@
     "type": "SkillDefinition",
     "id": 118,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 22.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 2
+          "referenceId": "dmg",
+          "baseValue": 7.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": []
     }
   },
-  "m_displayName": "COMMON - Earth 5 - Posture de la Terre",
+  "m_displayName": "IOP - Earth 5 - Posture de la Terre",
   "m_availability": 3,
   "m_i18nNameId": 14465,
   "m_i18nDescriptionId": 81830,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "db8a7fef5dfd745f69f7daa7c81fe3ee"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/123.json b/data/json/SkillDefinition/123.json
index e6c249333fd88154b156ee64eb6a938c327606b3..793585d726f9fd30aa2714fcda0d640e6608a968 100644
--- a/data/json/SkillDefinition/123.json
+++ b/data/json/SkillDefinition/123.json
@@ -19,7 +19,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -28,7 +31,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/124.json b/data/json/SkillDefinition/124.json
index cc6cf57f321b6850f71ea9191b071069145cca69..578a39179207908488712be320543a94abcf7918 100644
--- a/data/json/SkillDefinition/124.json
+++ b/data/json/SkillDefinition/124.json
@@ -5,22 +5,20 @@
     "type": "SkillDefinition",
     "id": 124,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 3.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
-        "METEOR",
-        "AVENGERHOURGLASS"
+        "METEOR"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/125.json b/data/json/SkillDefinition/125.json
index a1bac9b8428fcec59b8b47ddb4fe8dde2ea8c868..1348542445d31cd0e2965a418f3099c31eb845b1 100644
--- a/data/json/SkillDefinition/125.json
+++ b/data/json/SkillDefinition/125.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 125,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/126.json b/data/json/SkillDefinition/126.json
index b49158bd8be7212fa5ccfb3385d633fb0232e932..34767fd1458421c8270cd4c4972b445aa5badd0e 100644
--- a/data/json/SkillDefinition/126.json
+++ b/data/json/SkillDefinition/126.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 126,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/127.json b/data/json/SkillDefinition/127.json
index 179202610905f0483c9665098e66faad4d6725ef..06656b4a22de83b2cd7e8d86ee1d9b9676226297 100644
--- a/data/json/SkillDefinition/127.json
+++ b/data/json/SkillDefinition/127.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 127,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/128.json b/data/json/SkillDefinition/128.json
index 3c1fe03bf74a6d7130d255f880f67e7669bf5c0a..52ad61320f7bca6629a20760f5a423e556e5a643 100644
--- a/data/json/SkillDefinition/128.json
+++ b/data/json/SkillDefinition/128.json
@@ -5,24 +5,25 @@
     "type": "SkillDefinition",
     "id": 128,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 40.0,
-          "factor": 2.0
+          "referenceId": "boost",
+          "baseValue": 10.0,
+          "factor": 3.0
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 2
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
+        "DEATHBLOW",
         "CHAMPIONAURA",
         {
           "type": 25,
diff --git a/data/json/SkillDefinition/129.json b/data/json/SkillDefinition/129.json
index ef9a79a1e89a945be9336fe30723fd17f2cd5eb5..3e8b4393d264403e852128522c1c4da7f63be0f4 100644
--- a/data/json/SkillDefinition/129.json
+++ b/data/json/SkillDefinition/129.json
@@ -5,30 +5,24 @@
     "type": "SkillDefinition",
     "id": 129,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "at",
           "baseValue": 0.0,
-          "factor": 2.0
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Voldorak Vo - Empty 2 - Projection d\u0027Onde",
   "m_availability": 3,
   "m_i18nNameId": 64927,
   "m_i18nDescriptionId": 82541,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/130.json b/data/json/SkillDefinition/130.json
index 512351f19070ff65cef506c8c22d89c6c1c82884..bbf06fd312e43ca32a2fc2c135ad621a42d37d12 100644
--- a/data/json/SkillDefinition/130.json
+++ b/data/json/SkillDefinition/130.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 130,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/131.json b/data/json/SkillDefinition/131.json
index d752643de1c02f6a1fa0497513607b2c36fd18eb..5b469e8c8ee58df9754a9e864ab7084f490aede7 100644
--- a/data/json/SkillDefinition/131.json
+++ b/data/json/SkillDefinition/131.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 131,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/132.json b/data/json/SkillDefinition/132.json
index 97b340bf5ced4011683ec0da3b9c295a932a301e..9c34d042a057f76947da1f2001fba62d81d5f23a 100644
--- a/data/json/SkillDefinition/132.json
+++ b/data/json/SkillDefinition/132.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 132,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/133.json b/data/json/SkillDefinition/133.json
index 4f48910fb32b6f13f259b47b85395821c8aa0d64..977f5f4f2a2d5c31cffa789ffe20ac6c614b5a40 100644
--- a/data/json/SkillDefinition/133.json
+++ b/data/json/SkillDefinition/133.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 133,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/134.json b/data/json/SkillDefinition/134.json
index 31e4c6e2ea4c6c898582f2cc88fcfac73ce4d81e..ac167c749a9a5079e302952a0739e5d820adeea6 100644
--- a/data/json/SkillDefinition/134.json
+++ b/data/json/SkillDefinition/134.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 134,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 33.33
+          "baseValue": 250.0,
+          "factor": 50.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/1358.json b/data/json/SkillDefinition/1358.json
index 6b71a2404dbf56163304a7522223bf4bc4538ec9..3039d92652f6839bd6fb604e796595ad0a0b46bd 100644
--- a/data/json/SkillDefinition/1358.json
+++ b/data/json/SkillDefinition/1358.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 1358,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/136.json b/data/json/SkillDefinition/136.json
index 86e0cf3ebdadddb70a4e42ffca3a685f22b61bf8..e5bc9f69a8af486248de2c871adaec288868db24 100644
--- a/data/json/SkillDefinition/136.json
+++ b/data/json/SkillDefinition/136.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 136,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/1369.json b/data/json/SkillDefinition/1369.json
index f9543fab5a8deaa9297451fc6c76a90c77059b3f..06301a1ba0efe848f894c837f05a9333615b5235 100644
--- a/data/json/SkillDefinition/1369.json
+++ b/data/json/SkillDefinition/1369.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 1369,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/138.json b/data/json/SkillDefinition/138.json
index 2709de1ba661472ada63dea2d495735e2c6f12eb..28b8ae614e645fc3ad57a3895e789acaabd1b0e1 100644
--- a/data/json/SkillDefinition/138.json
+++ b/data/json/SkillDefinition/138.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 138,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/14.json b/data/json/SkillDefinition/14.json
index dbdd867738fbb5c2f51a5d6595576f979611b5c5..72336b5d7c1a249eb48f3fbfaf2078f373f24c17 100644
--- a/data/json/SkillDefinition/14.json
+++ b/data/json/SkillDefinition/14.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 14,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/140.json b/data/json/SkillDefinition/140.json
index 8a1d17e94743136d058337afcf1c43b78176f184..104684b41143ca2f7abdd414d51ad75a7bb1de33 100644
--- a/data/json/SkillDefinition/140.json
+++ b/data/json/SkillDefinition/140.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 140,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/141.json b/data/json/SkillDefinition/141.json
index 6931fa80e193ebe8ee1c557a86a418c851ef643c..adcc66a30d16988ae0106ca17862bef66f0e6817 100644
--- a/data/json/SkillDefinition/141.json
+++ b/data/json/SkillDefinition/141.json
@@ -5,21 +5,19 @@
     "type": "SkillDefinition",
     "id": 141,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "referenceId": "buffP",
+          "baseValue": 5.0,
+          "factor": 5.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Sabliaton Jikan - Light 2 - Réglage Noble",
diff --git a/data/json/SkillDefinition/143.json b/data/json/SkillDefinition/143.json
index 4bb6f784099585decaaf80a1f16211cb168d8300..66e7877ea3fe3ad6bbf207adc34f34b7e93840b9 100644
--- a/data/json/SkillDefinition/143.json
+++ b/data/json/SkillDefinition/143.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 143,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/144.json b/data/json/SkillDefinition/144.json
index 24745df658c18bb5ee2fe77081c24a5f6bf7d5fa..43a11c3a69a062db2f65f44d7cb73f34891e8789 100644
--- a/data/json/SkillDefinition/144.json
+++ b/data/json/SkillDefinition/144.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 144,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/147.json b/data/json/SkillDefinition/147.json
index ecc3eac91e09856b4bbec50018f474f9204318f8..c7a4808fe111e326fd878cf39223604de56715ba 100644
--- a/data/json/SkillDefinition/147.json
+++ b/data/json/SkillDefinition/147.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 147,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/148.json b/data/json/SkillDefinition/148.json
index 9c14a1db574986e6f6897309ddd66c1468b79a8c..520594631d23cdd696254349ecac7c3f13f412ef 100644
--- a/data/json/SkillDefinition/148.json
+++ b/data/json/SkillDefinition/148.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 148,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/150.json b/data/json/SkillDefinition/150.json
index a97ee00b1aa4f7db6123d264334a4a637495c31e..f7514830071f376e1df04b1bfabbc1c5ee407b2f 100644
--- a/data/json/SkillDefinition/150.json
+++ b/data/json/SkillDefinition/150.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 150,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/1501.json b/data/json/SkillDefinition/1501.json
index e49d071cb27d42bb0bfe19e513e1db51e29a0e3a..6c1ea9141aa3c94ccf833928b368a76cfc3eabfc 100644
--- a/data/json/SkillDefinition/1501.json
+++ b/data/json/SkillDefinition/1501.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 1501,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.8
         }
       ],
       "hasEffects": true,
@@ -26,5 +31,5 @@
   "m_availability": 3,
   "m_i18nNameId": 90065,
   "m_i18nDescriptionId": 82215,
-  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
+  "assetGuid": "a52adb3fac6a36c409301e33bf8c5b82"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/152.json b/data/json/SkillDefinition/152.json
index 810b126bf16f660b09a4b11912742f3cd43e74f1..de983635aa7034ae3a95a774a15bde3af207bdd1 100644
--- a/data/json/SkillDefinition/152.json
+++ b/data/json/SkillDefinition/152.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 152,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/153.json b/data/json/SkillDefinition/153.json
index 35db1d2aad9ce94a004e3bedee7524f803b553f4..8c4040cc2dd2d9b7bef02f15055258c8bd645667 100644
--- a/data/json/SkillDefinition/153.json
+++ b/data/json/SkillDefinition/153.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 153,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/155.json b/data/json/SkillDefinition/155.json
index f25899efde50e6efa742c895e2fd331fa79e0d2b..9158e32a998a4f638f6657a8e7438a18677d8405 100644
--- a/data/json/SkillDefinition/155.json
+++ b/data/json/SkillDefinition/155.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 155,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/157.json b/data/json/SkillDefinition/157.json
index 86b0755180934bff5257d9506a3c6891afff9281..1ed56c793170b3a7f17a7a188ecf8431d3a15a78 100644
--- a/data/json/SkillDefinition/157.json
+++ b/data/json/SkillDefinition/157.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 157,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/167.json b/data/json/SkillDefinition/167.json
index 0b99fccc21faa9747e05f49c3cd4f9eeaa6c4435..b14adda1a58cd3acbcd68aa93acdfede6be5abac 100644
--- a/data/json/SkillDefinition/167.json
+++ b/data/json/SkillDefinition/167.json
@@ -5,21 +5,21 @@
     "type": "SkillDefinition",
     "id": 167,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "dmg",
+          "baseValue": 1.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "SHIELD",
-        "METEOR"
+        "METEOR",
+        "SHIELD"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/168.json b/data/json/SkillDefinition/168.json
index 0a46562def1bd0a8bb6c4cedc66c96079473a841..3832cff278f94f71ac670d1bd34d87920c23e52b 100644
--- a/data/json/SkillDefinition/168.json
+++ b/data/json/SkillDefinition/168.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 168,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/170.json b/data/json/SkillDefinition/170.json
index a90b426598583ce7e333b74f166e32b2bce09480..a42216bf5fff82f6739d5f3cd97cb351045b9295 100644
--- a/data/json/SkillDefinition/170.json
+++ b/data/json/SkillDefinition/170.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 170,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 30.0
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -24,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 47727,
   "m_i18nDescriptionId": 67669,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "aebba4430daec0349b1317221a56a144"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/171.json b/data/json/SkillDefinition/171.json
index 19401eaf84f8e92eb3a9cb77162867b5c69f4cad..15545dc03e579fbca8897127b54f209acd32ec39 100644
--- a/data/json/SkillDefinition/171.json
+++ b/data/json/SkillDefinition/171.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 171,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/172.json b/data/json/SkillDefinition/172.json
index 06d443400c4eaee965d444fa9dc08673efa03538..0d40727d73e16f83f2dca89948c21034a1fad090 100644
--- a/data/json/SkillDefinition/172.json
+++ b/data/json/SkillDefinition/172.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 172,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/173.json b/data/json/SkillDefinition/173.json
index 9da050d83e38ac75b31db1a4a762d4a74252408b..b1429f20e479e26ac94bad6a23d54ea00bd75aac 100644
--- a/data/json/SkillDefinition/173.json
+++ b/data/json/SkillDefinition/173.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 173,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/1762.json b/data/json/SkillDefinition/1762.json
index 61e7b6f657e1ceb1cca5aacf0b4a2742db81ccaf..bd2ac534408477ad99d89dd8afa513bf3fae8f3d 100644
--- a/data/json/SkillDefinition/1762.json
+++ b/data/json/SkillDefinition/1762.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 1762,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/177.json b/data/json/SkillDefinition/177.json
index 4f9cdc2763ca8f6cd6042b4167e7dd9e43d18fcb..e3976b98fa37d0a619516d29c6475eac6f536dd1 100644
--- a/data/json/SkillDefinition/177.json
+++ b/data/json/SkillDefinition/177.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 177,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 23.33
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 2.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "UNTARGETABLE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Water 4 - Repli du Torrent",
   "m_availability": 3,
   "m_i18nNameId": 46782,
   "m_i18nDescriptionId": 8026,
-  "assetGuid": "592bd28a403f7994796d676e5b667bf5"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/179.json b/data/json/SkillDefinition/179.json
index d22e614fe3189449bb144856dffa67101f1473ee..fb92131662ec77c2c410a392ae59ce36759743c9 100644
--- a/data/json/SkillDefinition/179.json
+++ b/data/json/SkillDefinition/179.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 300
+          "value": 6000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 300
+          "value": 6000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/18.json b/data/json/SkillDefinition/18.json
index 1c7d40783de55fc61542e0990e4edca1162cab65..13eb2d5a89b32282f4ffbd408eeba96255d8ac99 100644
--- a/data/json/SkillDefinition/18.json
+++ b/data/json/SkillDefinition/18.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 18,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/1809.json b/data/json/SkillDefinition/1809.json
index 03598328c42f0d8b22230573f7c3bc81cf18cd20..9d0c3a0d36cbfc3731f3a45cf5640f34af76b619 100644
--- a/data/json/SkillDefinition/1809.json
+++ b/data/json/SkillDefinition/1809.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 1809,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/1812.json b/data/json/SkillDefinition/1812.json
index 41ad6ce8f9fa63bfce349d4452ec94a79c31f9cd..daf339ce606efe8ca6cfce126ee9515b1fd3fa01 100644
--- a/data/json/SkillDefinition/1812.json
+++ b/data/json/SkillDefinition/1812.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 1812,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/182.json b/data/json/SkillDefinition/182.json
index 02c3254daab9fc11efab3b01050c30b58e8fb0bf..3ac8d5b64bcf75e555e5c72c7921b77bc8b5b132 100644
--- a/data/json/SkillDefinition/182.json
+++ b/data/json/SkillDefinition/182.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 182,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "buffM",
           "baseValue": 0.0,
-          "factor": 33.33
+          "factor": 5.0
         }
       ],
       "hasEffects": true,
@@ -24,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 65326,
   "m_i18nDescriptionId": 78035,
-  "assetGuid": "d6f4b19ec899c0947b9176ec7dce90cb"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/184.json b/data/json/SkillDefinition/184.json
index 0e6a2110682e820a1d650b45f90961dad6dd75b8..920904194eb852dccf83ba9d96f6b65a4c2c391a 100644
--- a/data/json/SkillDefinition/184.json
+++ b/data/json/SkillDefinition/184.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 184,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/185.json b/data/json/SkillDefinition/185.json
index 093e8ef8eea7aaa58382d5745eaa47c1edf2c1c5..fdf375e42e781dbda19c73a475caa300e4e3ed08 100644
--- a/data/json/SkillDefinition/185.json
+++ b/data/json/SkillDefinition/185.json
@@ -5,31 +5,29 @@
     "type": "SkillDefinition",
     "id": 185,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.0
+          "factor": 5.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Régulant Gurpapa - Empty 2 - Cuirasse Éthérée",
   "m_availability": 3,
   "m_i18nNameId": 37096,
   "m_i18nDescriptionId": 3189,
-  "assetGuid": "0fdc0080cb977ce4d8f4cd00cc97533e"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/187.json b/data/json/SkillDefinition/187.json
index d15dab9e5552d612b6d1a490ffb45ecad7e2aa8d..e696e2718328af30ad4a5a1a51163e3477e6b76c 100644
--- a/data/json/SkillDefinition/187.json
+++ b/data/json/SkillDefinition/187.json
@@ -5,32 +5,29 @@
     "type": "SkillDefinition",
     "id": 187,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "type": "ConstIntegerValue",
+          "referenceId": "nb",
+          "value": 2
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc2",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "referenceId": "ar",
+          "baseValue": 0.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "BOUNCE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Bunelame - Magma 2 - Écho Bruyant",
   "m_availability": 3,
   "m_i18nNameId": 61959,
   "m_i18nDescriptionId": 53153,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/189.json b/data/json/SkillDefinition/189.json
index 70a3d531dab06da78981f154d9c0ae8ecf61fff6..582d0e4e8e7cb57d98950c6b709b94768d6a6330 100644
--- a/data/json/SkillDefinition/189.json
+++ b/data/json/SkillDefinition/189.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 189,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/19.json b/data/json/SkillDefinition/19.json
index ef61618e2ae02f81739011d7c4686d354c2a8ed4..e2cb37133fecb4a4c112160c725410db2127c73d 100644
--- a/data/json/SkillDefinition/19.json
+++ b/data/json/SkillDefinition/19.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 19,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/190.json b/data/json/SkillDefinition/190.json
index f4ec9947b3eedfab5ff0c6a86008a3d1847ef625..532fb104f89cf179715a7a93e9bdd2e757342e8b 100644
--- a/data/json/SkillDefinition/190.json
+++ b/data/json/SkillDefinition/190.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 190,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/193.json b/data/json/SkillDefinition/193.json
index fc03b8d1fbf021fd38086c6824c2ed85048fe8fb..e2c228041184ce807ddc2702087be37896bf0714 100644
--- a/data/json/SkillDefinition/193.json
+++ b/data/json/SkillDefinition/193.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 193,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/195.json b/data/json/SkillDefinition/195.json
index aec23f8cb87009e0fffa5f5517617a02b561d878..d73692254e1e67df01b0fdf729923dd50fd8cf7e 100644
--- a/data/json/SkillDefinition/195.json
+++ b/data/json/SkillDefinition/195.json
@@ -17,7 +17,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/203.json b/data/json/SkillDefinition/203.json
index 1b2f09e4b10a7bf43eef8e46f28bbe01c14fdbbe..a1864da259ef15e62016b0ddee50350c6bea92f9 100644
--- a/data/json/SkillDefinition/203.json
+++ b/data/json/SkillDefinition/203.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 203,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/206.json b/data/json/SkillDefinition/206.json
index 80f4bdd6aa4dc44b6947d01063510c467c426acc..089c65cfde51f238a9e7c0b56a50e4053f00d954 100644
--- a/data/json/SkillDefinition/206.json
+++ b/data/json/SkillDefinition/206.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 206,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/208.json b/data/json/SkillDefinition/208.json
index 7c4086ce9c608ed235adb1f01e02ccf0db86d871..d18ec2dc4dbe21fab2a8be881bc924d9c0fd8543 100644
--- a/data/json/SkillDefinition/208.json
+++ b/data/json/SkillDefinition/208.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 208,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/210.json b/data/json/SkillDefinition/210.json
index 04546e311beeb6619cda97bbea878f473624532e..ed4e992b92facd57c858a55ffeb757e10e4df89b 100644
--- a/data/json/SkillDefinition/210.json
+++ b/data/json/SkillDefinition/210.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 210,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 33.33
+          "baseValue": 250.0,
+          "factor": 50.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/211.json b/data/json/SkillDefinition/211.json
index 4cde65de2a53761d2e73fb5d5bb4498f6c2835c9..e54c2a15f3f2d776d6ade50362517cdad05a16ac 100644
--- a/data/json/SkillDefinition/211.json
+++ b/data/json/SkillDefinition/211.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 211,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 20.0
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 3
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 60
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "buffP",
+          "baseValue": 10.0,
+          "factor": 10.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/212.json b/data/json/SkillDefinition/212.json
index 5ab9a7fc135ff26ef5fc28cc290bea1f13c4ed92..3108d53428b3a19c4a4d12f78dbc00e4a4f13860 100644
--- a/data/json/SkillDefinition/212.json
+++ b/data/json/SkillDefinition/212.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 212,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/214.json b/data/json/SkillDefinition/214.json
index dd26da9ffeaff2206c3442e1ed656a7f4c146a16..d804865449702f1f1cff8b291b3a36957621c7ce 100644
--- a/data/json/SkillDefinition/214.json
+++ b/data/json/SkillDefinition/214.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 214,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/217.json b/data/json/SkillDefinition/217.json
index d27a48b7b77c2bf5b78a280de8d54e9195062d2d..a8744b00e9ba406a93148d0474a8527c6baa2e65 100644
--- a/data/json/SkillDefinition/217.json
+++ b/data/json/SkillDefinition/217.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 217,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/218.json b/data/json/SkillDefinition/218.json
index 4550aac048777ca615bbfe2c7b16d43c4aab0011..574b61deb5d59bc04438f032188fdcb80c47ee3c 100644
--- a/data/json/SkillDefinition/218.json
+++ b/data/json/SkillDefinition/218.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 218,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/221.json b/data/json/SkillDefinition/221.json
index d8d76a48f3f61309d0945fb2d5486fb11d2e4b70..242398b2d7da5cc0911a2d5f153f88c0a132ad39 100644
--- a/data/json/SkillDefinition/221.json
+++ b/data/json/SkillDefinition/221.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 221,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/222.json b/data/json/SkillDefinition/222.json
index 4c96da56ca07cd7798b6f5e78de2a9c3f4d60886..335ebfec485d9577b2db399ff6d14a049ae251ff 100644
--- a/data/json/SkillDefinition/222.json
+++ b/data/json/SkillDefinition/222.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 222,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/224.json b/data/json/SkillDefinition/224.json
index 1a31ce9267e0b1763e24043dd3cb3a80b26438cd..0c068a244dd0308fabd2cea9801dd3ca489554fa 100644
--- a/data/json/SkillDefinition/224.json
+++ b/data/json/SkillDefinition/224.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 224,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/225.json b/data/json/SkillDefinition/225.json
index 0233942e6d541656270bd4017dda713187664308..01c84f3b000d62f34d74f4cb7a25d7c49ee3b277 100644
--- a/data/json/SkillDefinition/225.json
+++ b/data/json/SkillDefinition/225.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 225,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/226.json b/data/json/SkillDefinition/226.json
index 7111439ad927d38d7a072ef426c9ff697f90c8cf..7caaa2fcf51efde0b7994b67f45c7efa9a40e27a 100644
--- a/data/json/SkillDefinition/226.json
+++ b/data/json/SkillDefinition/226.json
@@ -5,30 +5,28 @@
     "type": "SkillDefinition",
     "id": 226,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 3
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
+        "MECHANISM",
         {
-          "type": 25,
-          "id": 38
+          "type": 7,
+          "id": 903
         },
-        "WAVE"
+        {
+          "type": 25,
+          "id": 892
+        }
       ]
     }
   },
@@ -36,5 +34,5 @@
   "m_availability": 3,
   "m_i18nNameId": 10124,
   "m_i18nDescriptionId": 26858,
-  "assetGuid": "9085b25ad140f5f4c869893f5f173030"
+  "assetGuid": "dc7adc63dce195247914685e580b5271"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/2274.json b/data/json/SkillDefinition/2274.json
index 225be4d2d1bd6efe22c4f3ebdebe973795f4a788..214c34e5a7d6c86b1018f6c427be81970519b50d 100644
--- a/data/json/SkillDefinition/2274.json
+++ b/data/json/SkillDefinition/2274.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 2274,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/229.json b/data/json/SkillDefinition/229.json
index 8782d5737858dfc2d250106a9b41371da6739d78..eb8f2d7e45a280c2aa79b91c45c59ba1573f7dfa 100644
--- a/data/json/SkillDefinition/229.json
+++ b/data/json/SkillDefinition/229.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 229,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/23.json b/data/json/SkillDefinition/23.json
index cc19f790b3ed58d8be991c6ce3b056d7b1d9dc5b..fb6c0dfad5a545e390ee52c8a13736aa57af1a6d 100644
--- a/data/json/SkillDefinition/23.json
+++ b/data/json/SkillDefinition/23.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 23,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/230.json b/data/json/SkillDefinition/230.json
index ab0f5817c1a2d2f4784c4367bc40ba0eb6b9105e..896a04082b1324f7e7634c96fe8fe43d6124f520 100644
--- a/data/json/SkillDefinition/230.json
+++ b/data/json/SkillDefinition/230.json
@@ -5,20 +5,21 @@
     "type": "SkillDefinition",
     "id": 230,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 5.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "SHADOW"
+        "SHADOW",
+        "PHASE"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/231.json b/data/json/SkillDefinition/231.json
index 011c07e47a0097a57c91ae957e98285712a32b86..60dae07f1270b7ccd73c8c3da1da1cbb9b0144ad 100644
--- a/data/json/SkillDefinition/231.json
+++ b/data/json/SkillDefinition/231.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 150
+          "value": 3000
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 25
+          "value": 500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 150
+          "value": 3000
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 25
+          "value": 500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/234.json b/data/json/SkillDefinition/234.json
index 4007fbcf44ed0450ecf0997b4c03689801715326..a9c6fcd0dc69f231df78719e9b3d383a2b5077b8 100644
--- a/data/json/SkillDefinition/234.json
+++ b/data/json/SkillDefinition/234.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 234,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 23.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 1
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 83978,
   "m_i18nDescriptionId": 70846,
-  "assetGuid": "f4628f3d4f70e904f8326c5d15c2310b"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/235.json b/data/json/SkillDefinition/235.json
index 26a7243144e0aac13019b28a58631033c18a8de5..53004bb155b98d8c681169cbacd5938dce6183b5 100644
--- a/data/json/SkillDefinition/235.json
+++ b/data/json/SkillDefinition/235.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 235,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/237.json b/data/json/SkillDefinition/237.json
index 90c800aa88e212bb5239dc74cfb7b36a242cf817..6f0bf3ea269f2f3248d37d342514a880fb1c6852 100644
--- a/data/json/SkillDefinition/237.json
+++ b/data/json/SkillDefinition/237.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 237,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/241.json b/data/json/SkillDefinition/241.json
index d1d155b912b3e8bb451ccea4e281f5d673f06355..4dd8d92d4f6cc8b7ba735ade4e797411b33accc7 100644
--- a/data/json/SkillDefinition/241.json
+++ b/data/json/SkillDefinition/241.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 241,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/243.json b/data/json/SkillDefinition/243.json
index b646627db091a4c9a9b50a179e52af8b25e7f449..589da31ae7932835be57b893624f193861d31c05 100644
--- a/data/json/SkillDefinition/243.json
+++ b/data/json/SkillDefinition/243.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 243,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/244.json b/data/json/SkillDefinition/244.json
index a07ddf331e71953670c75cc25bf59ef34a8c438c..310f00a26bc94980c7253fd5050ade693dffa5cb 100644
--- a/data/json/SkillDefinition/244.json
+++ b/data/json/SkillDefinition/244.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 244,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/245.json b/data/json/SkillDefinition/245.json
index 9785b22f5a62f19289c00b0b039bed2fd123aeae..349f10e84d5b0bf2459f5ec3272051821027b27e 100644
--- a/data/json/SkillDefinition/245.json
+++ b/data/json/SkillDefinition/245.json
@@ -5,24 +5,22 @@
     "type": "SkillDefinition",
     "id": 245,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "referenceId": "buffP",
+          "baseValue": 5.0,
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
-  "m_displayName": "XELOR - Aiguille Pikuxala - Light 2 - Téléportation Foudroyante",
+  "m_displayName": "XELOR - Aiguille Pikuxala - Light 2 - Téléportation Lumineuse",
   "m_availability": 3,
   "m_i18nNameId": 8889,
   "m_i18nDescriptionId": 40022,
diff --git a/data/json/SkillDefinition/249.json b/data/json/SkillDefinition/249.json
index 317bbb37c659f39ebbfb1a289f3b40c6c0b1a1b1..1e0fa52f1bcb635d6670690eba4cd59703159ac9 100644
--- a/data/json/SkillDefinition/249.json
+++ b/data/json/SkillDefinition/249.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 249,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/25.json b/data/json/SkillDefinition/25.json
index bdead3ba009b8689fb85918c7294a2d7cc447c24..f7f2a0ab311fa092d1dec1eec76b45c32d3dded1 100644
--- a/data/json/SkillDefinition/25.json
+++ b/data/json/SkillDefinition/25.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 25,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/251.json b/data/json/SkillDefinition/251.json
index cd9bd34e2786469b344098a3372b0a28b08ad83a..8ffad2561b50427c442ce369cf98232844cf91f7 100644
--- a/data/json/SkillDefinition/251.json
+++ b/data/json/SkillDefinition/251.json
@@ -5,31 +5,27 @@
     "type": "SkillDefinition",
     "id": 251,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 0.0,
-          "factor": 4.0
+          "referenceId": "dmg",
+          "baseValue": 10.0,
+          "factor": 8.0
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
         "WAVE",
+        "UNIQUE",
         {
           "type": 4,
           "id": 204
diff --git a/data/json/SkillDefinition/252.json b/data/json/SkillDefinition/252.json
index a6c22de1ec2ae71a1b5c4958d181345e276a06bb..d6be6e65e88c7d91b337049f95cba51f0c63a915 100644
--- a/data/json/SkillDefinition/252.json
+++ b/data/json/SkillDefinition/252.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 252,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/253.json b/data/json/SkillDefinition/253.json
index 638d4f828a1b09644ab7a8ee581045ebc5ac42f3..d8a558057e9b77d9c2c1523c4526cabb1fcf9b7f 100644
--- a/data/json/SkillDefinition/253.json
+++ b/data/json/SkillDefinition/253.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 253,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/254.json b/data/json/SkillDefinition/254.json
index 5ecaefcfa32d6b2dbddd0a14535ec8c3c237111f..ed9dc00fa43d1b055c746c5ddc06d6bcc5cd621d 100644
--- a/data/json/SkillDefinition/254.json
+++ b/data/json/SkillDefinition/254.json
@@ -5,34 +5,24 @@
     "type": "SkillDefinition",
     "id": 254,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.33
+          "referenceId": "pv",
+          "baseValue": 5.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Flamboyante Kasaï - Dark 2 - Récupération Sordide",
   "m_availability": 3,
   "m_i18nNameId": 58716,
   "m_i18nDescriptionId": 20219,
-  "assetGuid": "1924e787deef5d14fa075790688d48bb"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/2543.json b/data/json/SkillDefinition/2543.json
index ba26c918aac9923e446654f9dea16990d140bc9d..f83575372b682014065d3a03f6b6e33b7ba60215 100644
--- a/data/json/SkillDefinition/2543.json
+++ b/data/json/SkillDefinition/2543.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 2543,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/255.json b/data/json/SkillDefinition/255.json
index 413469df12745da6d00df3c57cca4943ed0154dd..9ac46866a5f50f9670522d1172b98522fe4a11af 100644
--- a/data/json/SkillDefinition/255.json
+++ b/data/json/SkillDefinition/255.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 255,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/258.json b/data/json/SkillDefinition/258.json
index efd2c1b7d0d28b2f5a4a03a1b074657c0e412d72..c549df060084156864f82c37c03e33d1fde4c50c 100644
--- a/data/json/SkillDefinition/258.json
+++ b/data/json/SkillDefinition/258.json
@@ -5,28 +5,27 @@
     "type": "SkillDefinition",
     "id": 258,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 6.66
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 2.5
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "operc",
+          "baseValue": 2.0,
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "DEATHBLOW",
+        "SHADOW",
+        "UNIQUE",
         {
           "type": 4,
           "id": 644
diff --git a/data/json/SkillDefinition/26.json b/data/json/SkillDefinition/26.json
index f241c627d63f24dd4a85a8b4991de6e3c040f9f2..f6ba98027e91618d4d0adbf0259afb1f1a9db37e 100644
--- a/data/json/SkillDefinition/26.json
+++ b/data/json/SkillDefinition/26.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 26,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/261.json b/data/json/SkillDefinition/261.json
index 3497b1109224a4fc27702b640c78471006a1fe10..5ee4d93e1f8d5420dbef8380e71802440f43fcb9 100644
--- a/data/json/SkillDefinition/261.json
+++ b/data/json/SkillDefinition/261.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 261,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/264.json b/data/json/SkillDefinition/264.json
index c7074023f20a4c9be46b8b73218809b0cd82879d..f40ffb1e849ec4663757bc817706d8f0c9a78233 100644
--- a/data/json/SkillDefinition/264.json
+++ b/data/json/SkillDefinition/264.json
@@ -5,35 +5,24 @@
     "type": "SkillDefinition",
     "id": 264,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 2.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 3
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Arc Piven - Empty 2 - Recharge Éthérée",
   "m_availability": 3,
   "m_i18nNameId": 80523,
   "m_i18nDescriptionId": 21415,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/265.json b/data/json/SkillDefinition/265.json
index 01aae536ad2818c8ff80324949e443d468840668..4155171fe4201adfb87fc238c75afe1712212c05 100644
--- a/data/json/SkillDefinition/265.json
+++ b/data/json/SkillDefinition/265.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 265,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/266.json b/data/json/SkillDefinition/266.json
index 1756f593266789acc10c85b9efbabfa55ef20e85..945aee4768b0952bda8fc9c46ba3f1ccb96ff2cf 100644
--- a/data/json/SkillDefinition/266.json
+++ b/data/json/SkillDefinition/266.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 266,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/267.json b/data/json/SkillDefinition/267.json
index 57f1f5f536dd445e4564026f83cea29cbe5bfcf1..ac7c68b4b09630861eebe5098ed04cb69f4247af 100644
--- a/data/json/SkillDefinition/267.json
+++ b/data/json/SkillDefinition/267.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 267,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/269.json b/data/json/SkillDefinition/269.json
index 4598af15f4f89df7c8569c2e423270844586d3ff..1d695396d419336898765a70f36546b97fa80c50 100644
--- a/data/json/SkillDefinition/269.json
+++ b/data/json/SkillDefinition/269.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 269,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/27.json b/data/json/SkillDefinition/27.json
index f22971ab9ac6aa91eb05bd0c530b42829ccfd42c..44fbd778526429e5e9597bdee6f1feb86127c760 100644
--- a/data/json/SkillDefinition/27.json
+++ b/data/json/SkillDefinition/27.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 27,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/270.json b/data/json/SkillDefinition/270.json
index fedcee68fe6cc2758e8a665a65b995c5999ff1f6..53c98cfc8828d2afe5ddb662998bb3c79597c7df 100644
--- a/data/json/SkillDefinition/270.json
+++ b/data/json/SkillDefinition/270.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 270,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/271.json b/data/json/SkillDefinition/271.json
index 01b3670e42b649037ebc340ab9a81a8c5e12285a..d300c3122c5e6555da4b2a4c9061357fa048b8f0 100644
--- a/data/json/SkillDefinition/271.json
+++ b/data/json/SkillDefinition/271.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 271,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/272.json b/data/json/SkillDefinition/272.json
index 1d6cd726aff383d7b84de18e47c6d541db996437..bfbe6968031e23397402fc6120a45a520bf9bd18 100644
--- a/data/json/SkillDefinition/272.json
+++ b/data/json/SkillDefinition/272.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 272,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/273.json b/data/json/SkillDefinition/273.json
index 9c31283f438afa319b87fad08efabd141275fdbe..aa265ff594fa75e48204594e68a6db6726c32765 100644
--- a/data/json/SkillDefinition/273.json
+++ b/data/json/SkillDefinition/273.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 273,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/274.json b/data/json/SkillDefinition/274.json
index 435e0ec0c86258374ee6a423bdb006a057867877..aadb28c8bf2802d74eb507ebb0ee4784c7373cad 100644
--- a/data/json/SkillDefinition/274.json
+++ b/data/json/SkillDefinition/274.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 274,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/275.json b/data/json/SkillDefinition/275.json
index 3426c76a4395b3edaddb8d7b2995c308820a4c29..6696cdee427811585697f5ef938c1fcc9dba9488 100644
--- a/data/json/SkillDefinition/275.json
+++ b/data/json/SkillDefinition/275.json
@@ -5,29 +5,24 @@
     "type": "SkillDefinition",
     "id": 275,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 22.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 2
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": []
     }
   },
-  "m_displayName": "COMMON - Water 5 - Posture de l\u0027Eau",
+  "m_displayName": "IOP - Water 5 - Posture de l\u0027Eau",
   "m_availability": 3,
   "m_i18nNameId": 66932,
   "m_i18nDescriptionId": 73951,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "471c2686222e94a398d960396cf313dc"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/278.json b/data/json/SkillDefinition/278.json
index 99c2ce48879acdc9e67dfb9b1b807f1dcd6ab9f6..6e2e81982b6c9e88976ef63cdde13fe15d5e95a6 100644
--- a/data/json/SkillDefinition/278.json
+++ b/data/json/SkillDefinition/278.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 278,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/28.json b/data/json/SkillDefinition/28.json
index b2a741017089e4a9bb19d3f79cf27ec53da9cedf..92438a12c11b7d427ecdafff8dd566597cb37ddb 100644
--- a/data/json/SkillDefinition/28.json
+++ b/data/json/SkillDefinition/28.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 28,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "baseValue": 1.0,
+          "factor": 1.1
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/281.json b/data/json/SkillDefinition/281.json
index 38ecac08e11625898299f4f173dd7c475440923a..374e014d4227f9ea3ffe749b93e7428724d6c4b1 100644
--- a/data/json/SkillDefinition/281.json
+++ b/data/json/SkillDefinition/281.json
@@ -17,7 +17,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/283.json b/data/json/SkillDefinition/283.json
index bcaed91d56ee7c1e316c77883a345efc609dbb1f..087a86c1e200ae1248224e06c0b8f7a0b73720f8 100644
--- a/data/json/SkillDefinition/283.json
+++ b/data/json/SkillDefinition/283.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 283,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 4.667
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/284.json b/data/json/SkillDefinition/284.json
index ad8866ccc762c564747957694d6a9bbb72b12338..0c43a9500cf014baf48b8d7d2900127b0d9f7cf4 100644
--- a/data/json/SkillDefinition/284.json
+++ b/data/json/SkillDefinition/284.json
@@ -5,14 +5,14 @@
     "type": "SkillDefinition",
     "id": 284,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
+          "baseValue": 1.0,
           "factor": 1.0
         }
       ],
diff --git a/data/json/SkillDefinition/288.json b/data/json/SkillDefinition/288.json
index f2c045c5d0323989b1ab3af0996242d7545c51c9..e17d5c5339fee0e0c30c0fe1453dc4aac951a1c6 100644
--- a/data/json/SkillDefinition/288.json
+++ b/data/json/SkillDefinition/288.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 288,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/29.json b/data/json/SkillDefinition/29.json
index ab8423c0ac9da9269089dd316ecdfc86cbcdcd37..ac13ea69f98d67d9f2103dc5d735e2d508b0134c 100644
--- a/data/json/SkillDefinition/29.json
+++ b/data/json/SkillDefinition/29.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             76
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "mag",
-          "value": 50
+          "value": 500
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             75
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "phy",
-          "value": 50
+          "value": 500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "mag",
-          "value": 50
+          "value": 500
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "phy",
-          "value": 50
+          "value": 500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/290.json b/data/json/SkillDefinition/290.json
index 043c21ba6288e5fead5ac0d2e1b45f457521a45f..4fc6c682c026036985d446d2d5305e826085704e 100644
--- a/data/json/SkillDefinition/290.json
+++ b/data/json/SkillDefinition/290.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 290,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.667
+          "referenceId": "at",
+          "baseValue": 2.5,
+          "factor": 4.5
         }
       ],
       "hasEffects": true,
@@ -24,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 57617,
   "m_i18nDescriptionId": 63269,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/294.json b/data/json/SkillDefinition/294.json
index 63478f8fa49402063a63ea33592495449159c49c..e285912a147e2693945f9ce26cb245a4997282d3 100644
--- a/data/json/SkillDefinition/294.json
+++ b/data/json/SkillDefinition/294.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 294,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/295.json b/data/json/SkillDefinition/295.json
index 2dbefd6ceca27b1af0596e2a73a4983459fd751c..cf4931954239eb65b0dc8280576295e1851ecbb4 100644
--- a/data/json/SkillDefinition/295.json
+++ b/data/json/SkillDefinition/295.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 295,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/296.json b/data/json/SkillDefinition/296.json
index abb5b89e48a22820321193ce9141cfdc90faadad..af69a39f3271d4451509da6f7937dcb6f28c257b 100644
--- a/data/json/SkillDefinition/296.json
+++ b/data/json/SkillDefinition/296.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 296,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/298.json b/data/json/SkillDefinition/298.json
index a72c003b2d59c4af4003fc2a821d4d97919afde3..ab4d761a8ad3fd364705ba0008cfce11d432b42a 100644
--- a/data/json/SkillDefinition/298.json
+++ b/data/json/SkillDefinition/298.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 298,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/301.json b/data/json/SkillDefinition/301.json
index c93b712000c65e4cd585a3eda801d736feefaaf4..771f225943b466a07c64a68b923ebe55db20ce1c 100644
--- a/data/json/SkillDefinition/301.json
+++ b/data/json/SkillDefinition/301.json
@@ -5,21 +5,19 @@
     "type": "SkillDefinition",
     "id": 301,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "referenceId": "ar",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "METEOR"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Aiguille Pikuxala - Magma 2 - Téléportation Grondante",
diff --git a/data/json/SkillDefinition/303.json b/data/json/SkillDefinition/303.json
index 143a1b6021d382e777b515b4390f73e157ecc1c4..7fe1d6bbd82f6426dbbaef5490d64daca5350294 100644
--- a/data/json/SkillDefinition/303.json
+++ b/data/json/SkillDefinition/303.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 200
+          "value": 4000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 200
+          "value": 4000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/306.json b/data/json/SkillDefinition/306.json
index af6dbea012a6075b9f5a33564b22e00fd7fae3ab..89464f268b28913cab1eb8181e8c04ac1cdf9a28 100644
--- a/data/json/SkillDefinition/306.json
+++ b/data/json/SkillDefinition/306.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 306,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/307.json b/data/json/SkillDefinition/307.json
index 1c6504be112e8a43edd86413b21e20dab536d965..53793ecdc38a5877cd4de527ee14dd45143f7574 100644
--- a/data/json/SkillDefinition/307.json
+++ b/data/json/SkillDefinition/307.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 307,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/31.json b/data/json/SkillDefinition/31.json
index 6ac194751dcaf1562ae38c3781b20bbbce716c29..a58cb91205cdc4e45a25a82912d05952b98a4ff2 100644
--- a/data/json/SkillDefinition/31.json
+++ b/data/json/SkillDefinition/31.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 31,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.667
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/310.json b/data/json/SkillDefinition/310.json
index 7c0b265e66c879fad6de27aebefc4ab6a2639156..573404a892867fc2f1dd748d63971b355d5a5bdd 100644
--- a/data/json/SkillDefinition/310.json
+++ b/data/json/SkillDefinition/310.json
@@ -5,28 +5,19 @@
     "type": "SkillDefinition",
     "id": 310,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.66
+          "referenceId": "heal",
+          "baseValue": 2.0,
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW",
         "SHIELD"
       ]
     }
@@ -35,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 76784,
   "m_i18nDescriptionId": 70226,
-  "assetGuid": "1924e787deef5d14fa075790688d48bb"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/312.json b/data/json/SkillDefinition/312.json
index 594c54fa9394675bd5dd98b2fdc1b56af7d264d6..feac5c145becbabd1eae829eaebc272b19e7ad52 100644
--- a/data/json/SkillDefinition/312.json
+++ b/data/json/SkillDefinition/312.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 312,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/313.json b/data/json/SkillDefinition/313.json
index 2e95af2f0defdeff47b3b6a38e4dde3375734332..76bdb8073d74610c0eb64be1c3234753f787936d 100644
--- a/data/json/SkillDefinition/313.json
+++ b/data/json/SkillDefinition/313.json
@@ -5,29 +5,19 @@
     "type": "SkillDefinition",
     "id": 313,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "baseValue": 3.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
         "WAVE"
       ]
     }
@@ -36,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 36219,
   "m_i18nDescriptionId": 44590,
-  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
+  "assetGuid": "9085b25ad140f5f4c869893f5f173030"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/314.json b/data/json/SkillDefinition/314.json
index 829c165227e75b676c43d57f30256ac9af8b76f3..65e1c2730cfcdf3b4c01d0b564c93da9c1ad7b50 100644
--- a/data/json/SkillDefinition/314.json
+++ b/data/json/SkillDefinition/314.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 314,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/315.json b/data/json/SkillDefinition/315.json
index f4a46a898c121f2a01f975a0f6c9fb3aeaca5e44..39fb4941dd970d2cb98f60dc1b6fb5ad13193bd6 100644
--- a/data/json/SkillDefinition/315.json
+++ b/data/json/SkillDefinition/315.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             75
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/316.json b/data/json/SkillDefinition/316.json
index 0eb1ab3ad6339f84bebac1b76a6b36ba99af8913..c8df30a78d33a31e291bf2326a97aac98a6263a0 100644
--- a/data/json/SkillDefinition/316.json
+++ b/data/json/SkillDefinition/316.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 316,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/317.json b/data/json/SkillDefinition/317.json
index 2ef5b7090e532e227962cb933ee1ff4a200b6f58..a771861b57d4917a791a12f1ede8c122e5c7ab46 100644
--- a/data/json/SkillDefinition/317.json
+++ b/data/json/SkillDefinition/317.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 317,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/318.json b/data/json/SkillDefinition/318.json
index e3ae8a43cbd88bd3323740e6a518d2b36c26ceca..c89d5d96fec00ce6f9b986c6111f64076051fd62 100644
--- a/data/json/SkillDefinition/318.json
+++ b/data/json/SkillDefinition/318.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 318,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/319.json b/data/json/SkillDefinition/319.json
index cf78e0774c38b86ff11e1fc472b862a8abc78455..f24ff598feb4da9d543b15ebbff198b69ec5c773 100644
--- a/data/json/SkillDefinition/319.json
+++ b/data/json/SkillDefinition/319.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 319,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/320.json b/data/json/SkillDefinition/320.json
index 90bafd663dab2f75b2b02684d15531a12d4f3abc..0d2142bf6d4687f6456d0e126dddd6fa6acd8eeb 100644
--- a/data/json/SkillDefinition/320.json
+++ b/data/json/SkillDefinition/320.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 320,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "heal",
           "baseValue": 0.0,
-          "factor": 16.67
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 50
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 13297,
   "m_i18nDescriptionId": 84010,
-  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/321.json b/data/json/SkillDefinition/321.json
index 3e81f1af0f85a6838490f29475360448b85da963..867c356a72e2dce9621cd4b59e2482ab9d3a9ae0 100644
--- a/data/json/SkillDefinition/321.json
+++ b/data/json/SkillDefinition/321.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 25
+          "value": 500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 25
+          "value": 500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/322.json b/data/json/SkillDefinition/322.json
index e3a22463d975ea2d664734c4c4041cb67e111a78..4cf0d5be2fbaaa81cb73a1c1b1e5f12fd9808cfb 100644
--- a/data/json/SkillDefinition/322.json
+++ b/data/json/SkillDefinition/322.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 322,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/327.json b/data/json/SkillDefinition/327.json
index 5f79910e62bb06f316430c26a8bb237193b7675b..ad00f6cae2af85fd57cae3ef6201a6f7741821a4 100644
--- a/data/json/SkillDefinition/327.json
+++ b/data/json/SkillDefinition/327.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 327,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/329.json b/data/json/SkillDefinition/329.json
index c7cfb7690d9e5b563507d8a44e750443aa0b81d2..0f7ac8c6f37b3e95cacdee4746d107f9ba83f049 100644
--- a/data/json/SkillDefinition/329.json
+++ b/data/json/SkillDefinition/329.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 329,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/333.json b/data/json/SkillDefinition/333.json
index 186e3586480b7673561179f09cdd79e3ff42fd36..2498bf75e18a93d470c92df34565a33d22643d78 100644
--- a/data/json/SkillDefinition/333.json
+++ b/data/json/SkillDefinition/333.json
@@ -5,34 +5,19 @@
     "type": "SkillDefinition",
     "id": 333,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "pv",
+          "baseValue": 3.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Catalysateur Pramium - Dark 2 - Rouage Corrompu",
diff --git a/data/json/SkillDefinition/335.json b/data/json/SkillDefinition/335.json
index 0f76d03c6bd44fcd83500895a19d9b188687a0c7..5e157f10bb03c99b2f3b07397f66b91846fbb293 100644
--- a/data/json/SkillDefinition/335.json
+++ b/data/json/SkillDefinition/335.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 335,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/336.json b/data/json/SkillDefinition/336.json
index c01d876917d1ac0a63992d3942e3e76bc80c0943..320b80de35e6c8959962f06909e29216f8bfdee6 100644
--- a/data/json/SkillDefinition/336.json
+++ b/data/json/SkillDefinition/336.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 336,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/34.json b/data/json/SkillDefinition/34.json
index f2b7359bb970cd80f6389b371a6838d1effe0d54..5baefec07b0983163273010492743a83616f44b9 100644
--- a/data/json/SkillDefinition/34.json
+++ b/data/json/SkillDefinition/34.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 34,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/340.json b/data/json/SkillDefinition/340.json
index 6ef90cee2749ace6e5dbc488daade3c98d70c520..e7c7d9d27c2e8cb9c0004e575258213fd751d593 100644
--- a/data/json/SkillDefinition/340.json
+++ b/data/json/SkillDefinition/340.json
@@ -5,22 +5,20 @@
     "type": "SkillDefinition",
     "id": 340,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 2.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
-        "SHADOW",
-        "AVENGERHOURGLASS"
+        "SHADOW"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/341.json b/data/json/SkillDefinition/341.json
index 9d0135adb4ce368f20d6c58612e1cdfaae2afc77..535ee61008bd15d9398e7cd6833b451440c989cd 100644
--- a/data/json/SkillDefinition/341.json
+++ b/data/json/SkillDefinition/341.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 341,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/3419.json b/data/json/SkillDefinition/3419.json
index dc6815d088ba083280ab2047e91300c84439c6e9..5c9600ea09f11d649a1fd3c6b133afe4e0ea473c 100644
--- a/data/json/SkillDefinition/3419.json
+++ b/data/json/SkillDefinition/3419.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 100
+          "value": 2000
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 25
+          "value": 500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 100
+          "value": 2000
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 25
+          "value": 500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/343.json b/data/json/SkillDefinition/343.json
index 206c2b7445bdf13b8d2602330963962619fcf97c..01861510c7064fb965939150139e5cf149ca6ae9 100644
--- a/data/json/SkillDefinition/343.json
+++ b/data/json/SkillDefinition/343.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 343,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/344.json b/data/json/SkillDefinition/344.json
index 07781d1a364c9fadc34f13d8b70cd4b10d84be5d..c7a4d4207f3c5f69beccf2849ec99f75a0fb858c 100644
--- a/data/json/SkillDefinition/344.json
+++ b/data/json/SkillDefinition/344.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 344,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/345.json b/data/json/SkillDefinition/345.json
index 6c55fef34f587e43e93e64b0e409e257d84c2818..9d8bde36bff37d585b335baf00aea000fb2d7a84 100644
--- a/data/json/SkillDefinition/345.json
+++ b/data/json/SkillDefinition/345.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 345,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/346.json b/data/json/SkillDefinition/346.json
index 67929c977673f6395c9a5835ad39116fd221b071..08f94999431ceeba92bb6ec869d96f033e5fd4a3 100644
--- a/data/json/SkillDefinition/346.json
+++ b/data/json/SkillDefinition/346.json
@@ -5,22 +5,20 @@
     "type": "SkillDefinition",
     "id": 346,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 3.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
-        "WAVE",
-        "AVENGERHOURGLASS"
+        "WAVE"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/348.json b/data/json/SkillDefinition/348.json
index 618a8232c4331b2855415a6de85bd50ed041c251..7e0ba74ec7bc744a0e5da33bdaff4f07afef3091 100644
--- a/data/json/SkillDefinition/348.json
+++ b/data/json/SkillDefinition/348.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 348,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 3.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/349.json b/data/json/SkillDefinition/349.json
index ae8691682527c0fca1404a9e247364d6cf09e7ca..07871d70ac545d2fcf4b45561060e012e9bbb044 100644
--- a/data/json/SkillDefinition/349.json
+++ b/data/json/SkillDefinition/349.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 349,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/350.json b/data/json/SkillDefinition/350.json
index 919f5c07a40dd28bf3f7391e8840ce4c9ee1e178..08efad3402c35b1570bef1baf9b86358e7566d4a 100644
--- a/data/json/SkillDefinition/350.json
+++ b/data/json/SkillDefinition/350.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 350,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/353.json b/data/json/SkillDefinition/353.json
index 4f3c3ae7718a4805fca27b18264ccf0454d94d63..cab03faa1b0ec0e731cc19159c573cd4b81a3482 100644
--- a/data/json/SkillDefinition/353.json
+++ b/data/json/SkillDefinition/353.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 353,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/354.json b/data/json/SkillDefinition/354.json
index 3a6605087b51aad36afb32e4e1df4c4735da7920..ed7a449db7051e7fb92cc1e23ab912dbfdd9a04b 100644
--- a/data/json/SkillDefinition/354.json
+++ b/data/json/SkillDefinition/354.json
@@ -5,19 +5,20 @@
     "type": "SkillDefinition",
     "id": 354,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.0
+          "baseValue": 2.5,
+          "factor": 6.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "SIGHT",
         "WAVESIGHT"
       ]
     }
diff --git a/data/json/SkillDefinition/356.json b/data/json/SkillDefinition/356.json
index c76d3c3f36eddca45ff0db1d8e86fc762f169b76..2d3ec9f04725743764d4810a909af936802d4d89 100644
--- a/data/json/SkillDefinition/356.json
+++ b/data/json/SkillDefinition/356.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 356,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/358.json b/data/json/SkillDefinition/358.json
index 7b341606d247034a85f3b4aa394adc4a4c17e82b..c0682292c0c13420ff7389b5b27ca6658de2e9e5 100644
--- a/data/json/SkillDefinition/358.json
+++ b/data/json/SkillDefinition/358.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 358,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,12 +13,13 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "SHADOW"
+        "SHADOW",
+        "SIGHT"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/3588.json b/data/json/SkillDefinition/3588.json
index bf2f1d528dc226ecf97af90fbc5bbb5d91b55da8..740cec2642966c8ec43628c1d8ede81687fc8c06 100644
--- a/data/json/SkillDefinition/3588.json
+++ b/data/json/SkillDefinition/3588.json
@@ -5,31 +5,29 @@
     "type": "SkillDefinition",
     "id": 3588,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "nb",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "buffM",
           "baseValue": 0.0,
-          "factor": 2.33
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "BOUNCE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Bunelame - Empty 2 - Écho Miroir",
   "m_availability": 3,
   "m_i18nNameId": 30827,
   "m_i18nDescriptionId": 567,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/359.json b/data/json/SkillDefinition/359.json
index 30dc13c21dfb0de5e7ab843f15ad933e27d26620..b48120a77c5ae774840c3a5149135fc909f4fa11 100644
--- a/data/json/SkillDefinition/359.json
+++ b/data/json/SkillDefinition/359.json
@@ -8,7 +8,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -17,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/360.json b/data/json/SkillDefinition/360.json
index fa73e260f1ef87939af61606dc87203299cae402..1037c15d534ce8b825aa3300665244d895cb945b 100644
--- a/data/json/SkillDefinition/360.json
+++ b/data/json/SkillDefinition/360.json
@@ -5,19 +5,21 @@
     "type": "SkillDefinition",
     "id": 360,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 40.0,
-          "factor": 2.0
+          "baseValue": 10.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "FROZEN",
+        "DEATHBLOW",
         "CHAMPIONAURA",
         {
           "type": 25,
diff --git a/data/json/SkillDefinition/363.json b/data/json/SkillDefinition/363.json
index 2d0792fcc734219b882270eb1af4e002aa4837da..2b5cab75cf6e6315910b74629e440c1e02a578db 100644
--- a/data/json/SkillDefinition/363.json
+++ b/data/json/SkillDefinition/363.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 363,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/364.json b/data/json/SkillDefinition/364.json
index 3b18279ac30c3466b343677c533f65152b116297..0c5dc3a91c62016c36433de73865ea51864ddd75 100644
--- a/data/json/SkillDefinition/364.json
+++ b/data/json/SkillDefinition/364.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 364,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/370.json b/data/json/SkillDefinition/370.json
index 0a8d835e480cae51c4c3cd5c9ab4efadbf4025bf..fa4d18ae0a265d207d4fe766c4127ca2a11989db 100644
--- a/data/json/SkillDefinition/370.json
+++ b/data/json/SkillDefinition/370.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 370,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "dmg",
+          "baseValue": 2.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/378.json b/data/json/SkillDefinition/378.json
index 8409618cc84731565da558c625962d126dc1349e..71d243da98cd98fba50d1d8382f09d5ebf40eff1 100644
--- a/data/json/SkillDefinition/378.json
+++ b/data/json/SkillDefinition/378.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 378,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/379.json b/data/json/SkillDefinition/379.json
index 1a313399f6236897feed14b58bbb06db85bf0945..71b26538a858eec893f47bfa3e484bd63599bea0 100644
--- a/data/json/SkillDefinition/379.json
+++ b/data/json/SkillDefinition/379.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 379,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/380.json b/data/json/SkillDefinition/380.json
index fc230476c2cfe812563365b587f28d9b76bb73b1..d9f5723fcd9446db2b0e0a5df2933a675c46c5cf 100644
--- a/data/json/SkillDefinition/380.json
+++ b/data/json/SkillDefinition/380.json
@@ -5,29 +5,19 @@
     "type": "SkillDefinition",
     "id": 380,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "pv",
+          "baseValue": 3.0,
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Sabliaton Jikan - Dark 2 - Réglage Sadique",
diff --git a/data/json/SkillDefinition/382.json b/data/json/SkillDefinition/382.json
index bdef37299aacc15f6af2df5e92bb48d04807c958..9ba65b42101cdf7ff5ccb49d0e2203404f49abcc 100644
--- a/data/json/SkillDefinition/382.json
+++ b/data/json/SkillDefinition/382.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 60
+          "value": 1200
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 60
+          "value": 1200
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/384.json b/data/json/SkillDefinition/384.json
index 3ee3b24d1ff12cb7cd0456af923c6e400d507433..6e4af3f19ef769c2aa5b894779a2df928fbdf0ec 100644
--- a/data/json/SkillDefinition/384.json
+++ b/data/json/SkillDefinition/384.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 384,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/385.json b/data/json/SkillDefinition/385.json
index 6d900f2d7210d31410c4180f416ecfae0bbaa2b9..2ea158fa31d2365837927661773ccc7aeacb3a4a 100644
--- a/data/json/SkillDefinition/385.json
+++ b/data/json/SkillDefinition/385.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 385,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/386.json b/data/json/SkillDefinition/386.json
index 49b6cd1cb59a3ec3599596151addac3f03c02e54..e8a973dde9c5fbf58e355857f28993e01e5b9ec9 100644
--- a/data/json/SkillDefinition/386.json
+++ b/data/json/SkillDefinition/386.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 386,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/387.json b/data/json/SkillDefinition/387.json
index 55321a7791be3c1cfc1bd514202db665a09d8667..dfd0ac29a658b7d6e09bef8db0ecb1ba3e233f7d 100644
--- a/data/json/SkillDefinition/387.json
+++ b/data/json/SkillDefinition/387.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 387,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/388.json b/data/json/SkillDefinition/388.json
index 925b2640847d24de6d332710ecbfe030f33b9f58..0b778dc88600dbb49dba15cb97c19e4466a2c7a2 100644
--- a/data/json/SkillDefinition/388.json
+++ b/data/json/SkillDefinition/388.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 388,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/389.json b/data/json/SkillDefinition/389.json
index 4251987f917593680eb4cfac52680c00240a14b0..4cc85110dfed601ce9f3541fe08b74919ac5a9cc 100644
--- a/data/json/SkillDefinition/389.json
+++ b/data/json/SkillDefinition/389.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 389,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/391.json b/data/json/SkillDefinition/391.json
index 2a5f8cf38cd5d111ec0cf6ef036980fd5e6897d0..4ebb5829cc5f6ac18ebb2c8590462ae9d6f9df48 100644
--- a/data/json/SkillDefinition/391.json
+++ b/data/json/SkillDefinition/391.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 391,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/392.json b/data/json/SkillDefinition/392.json
index 00502dc40b41b641caa8e6a934a348ca86435369..217e6369d1576dedca25eae1750520248a067712 100644
--- a/data/json/SkillDefinition/392.json
+++ b/data/json/SkillDefinition/392.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 392,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/396.json b/data/json/SkillDefinition/396.json
index eddc603ab4778be1405dda4d511a701f7d0b5318..f37e5788bc9faadc4531af0b9ac21d3630eac7e0 100644
--- a/data/json/SkillDefinition/396.json
+++ b/data/json/SkillDefinition/396.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 40
+          "value": 800
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 40
+          "value": 800
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/399.json b/data/json/SkillDefinition/399.json
index a28bd85b74a0c35fa7348f4b23fe64491106d8e5..42c3c963611684411c7e70c51d5ab168f0943099 100644
--- a/data/json/SkillDefinition/399.json
+++ b/data/json/SkillDefinition/399.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 399,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 33.33
+          "baseValue": 250.0,
+          "factor": 50.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/40.json b/data/json/SkillDefinition/40.json
index e0b2f5be85917d0f86fd44fb3cf9156ad9ebf6e0..a85e829eb7284c81d24606c0e9d430369ddcd59c 100644
--- a/data/json/SkillDefinition/40.json
+++ b/data/json/SkillDefinition/40.json
@@ -5,33 +5,35 @@
     "type": "SkillDefinition",
     "id": 40,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 4.0
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 3
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "pdmg",
+          "baseValue": 0.0,
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "FROZEN",
+        "MECHANISM",
         {
-          "type": 4,
-          "id": 941
+          "type": 7,
+          "id": 1007
         },
         {
           "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
+          "id": 73656
+        }
       ]
     }
   },
@@ -39,5 +41,5 @@
   "m_availability": 3,
   "m_i18nNameId": 21445,
   "m_i18nDescriptionId": 27565,
-  "assetGuid": "1924e787deef5d14fa075790688d48bb"
+  "assetGuid": "83e29f714ef9b934cac8fb444815bcd0"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/401.json b/data/json/SkillDefinition/401.json
index 1931f021f6dd567c1e9d72fcea0ecfc30f2bb36b..dbb39d2dfc228776df0554582bbc5c0c667510fb 100644
--- a/data/json/SkillDefinition/401.json
+++ b/data/json/SkillDefinition/401.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 401,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/402.json b/data/json/SkillDefinition/402.json
index 8a37d1be259aedae8355e428cd3ed5ad8f050768..2e4d2c0b17004768654c91a297bdf70217072054 100644
--- a/data/json/SkillDefinition/402.json
+++ b/data/json/SkillDefinition/402.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 402,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/4042.json b/data/json/SkillDefinition/4042.json
index f39c799554c2a91471143d74fe56d6afbf93d71d..617538bd665eae4335c1774fb1d9815e3358fcd9 100644
--- a/data/json/SkillDefinition/4042.json
+++ b/data/json/SkillDefinition/4042.json
@@ -5,30 +5,29 @@
     "type": "SkillDefinition",
     "id": 4042,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "mg",
           "baseValue": 0.0,
-          "factor": 2.33
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Shiru Shaden - Empty 2 - Exécution Muette",
   "m_availability": 3,
   "m_i18nNameId": 80041,
   "m_i18nDescriptionId": 48502,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/406.json b/data/json/SkillDefinition/406.json
index 613dd66d38528e29f79175752c0dca5a1f32d80b..9b58f681317b27ddd711b3a13ee8f11de5c5661e 100644
--- a/data/json/SkillDefinition/406.json
+++ b/data/json/SkillDefinition/406.json
@@ -5,24 +5,27 @@
     "type": "SkillDefinition",
     "id": 406,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 46.66
-        },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "nb",
+          "referenceId": "s",
           "value": 2
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "perc",
+          "baseValue": 250.0,
+          "factor": 50.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "ACCURACY",
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Air 2 - Affûtage Aérien",
diff --git a/data/json/SkillDefinition/4063.json b/data/json/SkillDefinition/4063.json
index 7eae6fa1e6fb63cf4b4a5863c065b3fee665fbd0..36f5e56e2066d3f84e611b2f55c7a6663fe6f853 100644
--- a/data/json/SkillDefinition/4063.json
+++ b/data/json/SkillDefinition/4063.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 4063,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 50.0
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
-          "value": 2
+          "value": 3
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 0.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 16805,
   "m_i18nDescriptionId": 59710,
-  "assetGuid": "87c7409bd79b50f41840d176baacb916"
+  "assetGuid": "aebba4430daec0349b1317221a56a144"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/41.json b/data/json/SkillDefinition/41.json
index af219c32212af56f9a2239608d46b6c814158196..b7cbd310c15fbc87c0aea8cb64b801115a31a032 100644
--- a/data/json/SkillDefinition/41.json
+++ b/data/json/SkillDefinition/41.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 41,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -16,7 +16,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "COMPANION - EFFECT - SACRIEUR - Oracle Offensée",
diff --git a/data/json/SkillDefinition/410.json b/data/json/SkillDefinition/410.json
index 930de7fb913c2f90c8f3dd3904d1c9bc6750c40f..a525a8c7a927838fe3ec6ea6fc1b6857a83289bf 100644
--- a/data/json/SkillDefinition/410.json
+++ b/data/json/SkillDefinition/410.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 410,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/412.json b/data/json/SkillDefinition/412.json
index 046258767c6442f26a70905fa5109a070923c75f..ada6e3bd0385719324b1ea356a95d1a3264a25b4 100644
--- a/data/json/SkillDefinition/412.json
+++ b/data/json/SkillDefinition/412.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 412,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/413.json b/data/json/SkillDefinition/413.json
index 3112ad081f826481a82014959a4d5d1100e6057b..c884260b8ae51601a102ae32931a9fc7e1eca85c 100644
--- a/data/json/SkillDefinition/413.json
+++ b/data/json/SkillDefinition/413.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 413,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 4
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 16.67
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
@@ -24,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 38898,
   "m_i18nDescriptionId": 52438,
-  "assetGuid": "9cef3d91fb4ace648a0235f0e68bd4ed"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/414.json b/data/json/SkillDefinition/414.json
index bf187067dd6f03079bc1732459d869a4a2600c98..d9872a375a0e13b99efbf4260dfe34e0ce45d857 100644
--- a/data/json/SkillDefinition/414.json
+++ b/data/json/SkillDefinition/414.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             76
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "mag",
-          "value": 100
+          "value": 1000
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             75
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "phy",
-          "value": 100
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "mag",
-          "value": 100
+          "value": 1000
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "phy",
-          "value": 100
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/42.json b/data/json/SkillDefinition/42.json
index de202e027875f4f35a60ac8f51e20fb1716cc2a5..4cd7a7c9df8dc5dfc12ab4d5a31e19930d9dd460 100644
--- a/data/json/SkillDefinition/42.json
+++ b/data/json/SkillDefinition/42.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 42,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.667
+          "referenceId": "at",
+          "baseValue": 10.0,
+          "factor": 6.0
         }
       ],
       "hasEffects": true,
@@ -24,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 34512,
   "m_i18nDescriptionId": 75586,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/422.json b/data/json/SkillDefinition/422.json
index 16c91ce32d4db22c268adaab0febd3da8beece57..150575d31361640b0d66956bb998806d0298e59b 100644
--- a/data/json/SkillDefinition/422.json
+++ b/data/json/SkillDefinition/422.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 422,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/425.json b/data/json/SkillDefinition/425.json
index fd5d12a453b456af653e44acb0ddc23eae9fb91e..76b9877e715002b143b4fa1f2cf41495282b336b 100644
--- a/data/json/SkillDefinition/425.json
+++ b/data/json/SkillDefinition/425.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 425,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/428.json b/data/json/SkillDefinition/428.json
index 1abc11294561a947b84cf8fe64b6cd5472f84f63..bb0a694f5a25b7edd47f20003f4ee07544a3c0d0 100644
--- a/data/json/SkillDefinition/428.json
+++ b/data/json/SkillDefinition/428.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 428,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/430.json b/data/json/SkillDefinition/430.json
index 0b731e15c059246ac8cf43cbc75aa09e73e54d1a..e1b74b987d335fda3d92f5de8775f2166f223d70 100644
--- a/data/json/SkillDefinition/430.json
+++ b/data/json/SkillDefinition/430.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 430,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "at",
           "baseValue": 0.0,
-          "factor": 6.66
+          "factor": 6.0
         }
       ],
       "hasEffects": true,
@@ -24,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 54254,
   "m_i18nDescriptionId": 56510,
-  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/431.json b/data/json/SkillDefinition/431.json
index 0305f7d3cac766a8cf087e8773d2c5162366f6f8..a1a00bb8b1c3c41243c5a9e4597bbc28ac1e216e 100644
--- a/data/json/SkillDefinition/431.json
+++ b/data/json/SkillDefinition/431.json
@@ -8,7 +8,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -17,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/433.json b/data/json/SkillDefinition/433.json
index e189b057722692f630aca00342e08c3583dcbf6d..c26fecd8da476e0c6001873388b61cad17024fe3 100644
--- a/data/json/SkillDefinition/433.json
+++ b/data/json/SkillDefinition/433.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 433,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/434.json b/data/json/SkillDefinition/434.json
index 835a312bc296cb9e8437262366bf3378233dc266..651cbb22870fc1f87549fbc6040f9637022b505d 100644
--- a/data/json/SkillDefinition/434.json
+++ b/data/json/SkillDefinition/434.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             76
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/437.json b/data/json/SkillDefinition/437.json
index 9d41e9a1abb55335dc9769e9bfb895124d27ef55..d3fa2c2c77e7ac3d0aac960a17ed0da02e308760 100644
--- a/data/json/SkillDefinition/437.json
+++ b/data/json/SkillDefinition/437.json
@@ -5,26 +5,19 @@
     "type": "SkillDefinition",
     "id": 437,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "buffM",
+          "baseValue": 10.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Sabliaton Jikan - Empty 2 - Réglage Instable",
diff --git a/data/json/SkillDefinition/4398.json b/data/json/SkillDefinition/4398.json
index 21b1c62f51e3c324e9fa34796df2bef34566499e..4f5944e686bb56f458c7fe560a0ce7d2480cc563 100644
--- a/data/json/SkillDefinition/4398.json
+++ b/data/json/SkillDefinition/4398.json
@@ -5,31 +5,24 @@
     "type": "SkillDefinition",
     "id": 4398,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 5
+          "value": -5
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "buffM",
+          "baseValue": 5.0,
+          "factor": 6.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Synchronisateur Tako - Empty 2 - Accumulation Rémanente",
diff --git a/data/json/SkillDefinition/441.json b/data/json/SkillDefinition/441.json
index d7c604f3ca84b2635a1a4a8d92ca22989d5bda68..d1a402b5874ac9fc9a65a9840460b32bdbd589cf 100644
--- a/data/json/SkillDefinition/441.json
+++ b/data/json/SkillDefinition/441.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 441,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/443.json b/data/json/SkillDefinition/443.json
index 828adaa116582bb8db473763bc4fd3077c8189e5..0ed82816153a9b0590f2a423152f9c5a2a1a81c3 100644
--- a/data/json/SkillDefinition/443.json
+++ b/data/json/SkillDefinition/443.json
@@ -5,22 +5,20 @@
     "type": "SkillDefinition",
     "id": 443,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 3.667
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
-        "LIGHTNING",
-        "AVENGERHOURGLASS"
+        "LIGHTNING"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/444.json b/data/json/SkillDefinition/444.json
index 0efbda21b6b2acf549f6636d7f6dd2d218d8eb37..e47e2cca81203ef363ca013851cd42dbf33b4cf5 100644
--- a/data/json/SkillDefinition/444.json
+++ b/data/json/SkillDefinition/444.json
@@ -5,27 +5,24 @@
     "type": "SkillDefinition",
     "id": 444,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.0
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
         "SHADOW"
       ]
     }
@@ -34,5 +31,5 @@
   "m_availability": 3,
   "m_i18nNameId": 23346,
   "m_i18nDescriptionId": 81762,
-  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
+  "assetGuid": "1924e787deef5d14fa075790688d48bb"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/446.json b/data/json/SkillDefinition/446.json
index 967d00a1ca432cf867a82197cbc5908aad68be5c..c3ce9aba977488dbd3a64f8f2495cc842bd5f456 100644
--- a/data/json/SkillDefinition/446.json
+++ b/data/json/SkillDefinition/446.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 446,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/448.json b/data/json/SkillDefinition/448.json
index 6f2f58ab3a75bbc1b730fb5ecd059989b67acf24..dbf06e2a33647070c355d14ad7e347fb15c25909 100644
--- a/data/json/SkillDefinition/448.json
+++ b/data/json/SkillDefinition/448.json
@@ -5,47 +5,26 @@
     "type": "SkillDefinition",
     "id": 448,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "PerRangeLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "values": [
-            {
-              "k": 1,
-              "v": {
-                "type": "LinearLevelOnlyBasedDynamicValue",
-                "referenceId": "",
-                "baseValue": 0.0,
-                "factor": 30.0
-              }
-            },
-            {
-              "k": 11,
-              "v": {
-                "type": "LinearLevelOnlyBasedDynamicValue",
-                "referenceId": "",
-                "baseValue": -100.0,
-                "factor": 40.0
-              }
-            }
-          ]
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 2
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 0.0,
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FROZEN"
+      ]
     }
   },
   "m_displayName": "IOP - Water 3 - Bagarreur Concentre",
   "m_availability": 3,
   "m_i18nNameId": 82997,
   "m_i18nDescriptionId": 40457,
-  "assetGuid": "f4628f3d4f70e904f8326c5d15c2310b"
+  "assetGuid": "db8fc7bd1c8cc9447992bdbaf4af602a"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/449.json b/data/json/SkillDefinition/449.json
index c3f5a9ce95be64ad4b0ab7ef7df39d44ba53a695..ddb1c39a0add52b9be7e5a021e01a7ff341e5ca3 100644
--- a/data/json/SkillDefinition/449.json
+++ b/data/json/SkillDefinition/449.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 449,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/450.json b/data/json/SkillDefinition/450.json
index ae52f7070ff7213e86e6060d150a2aa57470de49..daf9ecfad6ee0ed2cd2571a6122dc3ae8ba16de7 100644
--- a/data/json/SkillDefinition/450.json
+++ b/data/json/SkillDefinition/450.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 450,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/456.json b/data/json/SkillDefinition/456.json
index 669feeda5bc2f18563899b93506d967bb171e30a..bfa58c8997e26567bca3fb2182c8fe7735b533b5 100644
--- a/data/json/SkillDefinition/456.json
+++ b/data/json/SkillDefinition/456.json
@@ -5,13 +5,13 @@
     "type": "SkillDefinition",
     "id": 456,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
           "factor": 1.0
         }
diff --git a/data/json/SkillDefinition/457.json b/data/json/SkillDefinition/457.json
index 62121ef960bf2a8f19ce5698d3b131036b915f17..f9a9c7970132ff0a0753e568f1edcc21679f5e70 100644
--- a/data/json/SkillDefinition/457.json
+++ b/data/json/SkillDefinition/457.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 457,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/46.json b/data/json/SkillDefinition/46.json
index e10848f9f967e53e8b8ae423edc99d041028062e..04951f1f67f0a752b8613169176e10dce7fdae35 100644
--- a/data/json/SkillDefinition/46.json
+++ b/data/json/SkillDefinition/46.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 46,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/471.json b/data/json/SkillDefinition/471.json
index dc3294c26c023af7698d84410ba292f96d15c766..ebc396d0aa8ab5bd3c4998e5a3376775be0a874a 100644
--- a/data/json/SkillDefinition/471.json
+++ b/data/json/SkillDefinition/471.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 471,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/472.json b/data/json/SkillDefinition/472.json
index 6da512549283c1948c9451c0444f4fdb3baa276c..0abfe08b576b02b9286909a4a2fc61c0ff844ee5 100644
--- a/data/json/SkillDefinition/472.json
+++ b/data/json/SkillDefinition/472.json
@@ -5,38 +5,24 @@
     "type": "SkillDefinition",
     "id": 472,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 3
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Arc Piven - Dark 2 - Recharge Sombre",
   "m_availability": 3,
   "m_i18nNameId": 96658,
   "m_i18nDescriptionId": 75615,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/475.json b/data/json/SkillDefinition/475.json
index 88e6721c01c890b26d55e8fb35c9ccc7f118d0ed..d555586fee702527c0f1e37de2250262adf020e7 100644
--- a/data/json/SkillDefinition/475.json
+++ b/data/json/SkillDefinition/475.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 475,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/477.json b/data/json/SkillDefinition/477.json
index ac50a35f4f36f163259f632e02a3df88775b57cc..0ec741ffb4fbcee3cdfddc115acb9fae78f48ce6 100644
--- a/data/json/SkillDefinition/477.json
+++ b/data/json/SkillDefinition/477.json
@@ -20,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/478.json b/data/json/SkillDefinition/478.json
index 5f2dcaf175357aeaaafd7b31e70d0f66251b1770..3664d088ea2f65c855459adf092b4c3e6a056bb5 100644
--- a/data/json/SkillDefinition/478.json
+++ b/data/json/SkillDefinition/478.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 478,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/48.json b/data/json/SkillDefinition/48.json
index 2ed23dfb33944319f11a894ba15b215ce7b346a4..08222cba5848f4d5262cc52556104f0f3f5c7f8b 100644
--- a/data/json/SkillDefinition/48.json
+++ b/data/json/SkillDefinition/48.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 48,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/480.json b/data/json/SkillDefinition/480.json
index 526960a8f5544bafdd55c8c037dd3c2e7bf4e96b..d17df90e6bf0aa75598cc0d567e43cb2fadf0b8f 100644
--- a/data/json/SkillDefinition/480.json
+++ b/data/json/SkillDefinition/480.json
@@ -5,33 +5,29 @@
     "type": "SkillDefinition",
     "id": 480,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Shiru Shaden - Dark 2 - Exécution Funeste",
   "m_availability": 3,
   "m_i18nNameId": 37829,
   "m_i18nDescriptionId": 41101,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/482.json b/data/json/SkillDefinition/482.json
index 94f7e6537749832a636814ff1a39bc7e041c2f77..8a1b0f7773890b00ddbebeea6b07abd3428c50a6 100644
--- a/data/json/SkillDefinition/482.json
+++ b/data/json/SkillDefinition/482.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 482,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/483.json b/data/json/SkillDefinition/483.json
index 58bddae1625c4ee93bfb8968b7252dc5c156b6a7..4597a6b9e778dc5dd1fbabf303bb3d72b891e3d8 100644
--- a/data/json/SkillDefinition/483.json
+++ b/data/json/SkillDefinition/483.json
@@ -5,20 +5,21 @@
     "type": "SkillDefinition",
     "id": 483,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.667
+          "baseValue": 1.0,
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "METEOR"
+        "METEOR",
+        "SIGHT"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/485.json b/data/json/SkillDefinition/485.json
index df2c115f97f86cd51c68d4fa8d07be490b283cbb..4468d3ba9cd6853e519caf04b292af16fbe06eaa 100644
--- a/data/json/SkillDefinition/485.json
+++ b/data/json/SkillDefinition/485.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 485,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/486.json b/data/json/SkillDefinition/486.json
index afaeb8f4a24b81c0b30a6eac5b956940219df109..a0851a8d65242214d17372bd48d58d3271738678 100644
--- a/data/json/SkillDefinition/486.json
+++ b/data/json/SkillDefinition/486.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 486,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.0
+          "referenceId": "dmg",
+          "baseValue": 2.5,
+          "factor": 6.5
         }
       ],
       "hasEffects": true,
@@ -24,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 80329,
   "m_i18nDescriptionId": 74441,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/487.json b/data/json/SkillDefinition/487.json
index b4d8648a84341c5c986bc0696bff5b093bc09d3c..16b8d7c79b4f190889d2d9ff7be203b7e1f362b0 100644
--- a/data/json/SkillDefinition/487.json
+++ b/data/json/SkillDefinition/487.json
@@ -5,21 +5,20 @@
     "type": "SkillDefinition",
     "id": 487,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 3
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc2",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "ar",
+          "baseValue": 0.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
@@ -30,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 73160,
   "m_i18nDescriptionId": 15415,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/488.json b/data/json/SkillDefinition/488.json
index 4ec0b52da14712feb335f583995ed07d80477401..4e3104f0ecbd62849d287da58d02e98a7b2cfb4a 100644
--- a/data/json/SkillDefinition/488.json
+++ b/data/json/SkillDefinition/488.json
@@ -5,21 +5,27 @@
     "type": "SkillDefinition",
     "id": 488,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "at",
+          "baseValue": 5.0,
+          "factor": 7.0
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 4.66
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
         "LIGHTNING",
-        "PHASE",
+        "UNIQUE",
         {
           "type": 4,
           "id": 236
diff --git a/data/json/SkillDefinition/49.json b/data/json/SkillDefinition/49.json
index bd7425c64787b2a5faa1d013c6a09e6425425132..6ef314a181481d9241a9c1f4ee669a68efb1c722 100644
--- a/data/json/SkillDefinition/49.json
+++ b/data/json/SkillDefinition/49.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 49,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/490.json b/data/json/SkillDefinition/490.json
index f2b4526350105f5be477e38d1a0a1fc6728679e6..8de4f8633c2db2517821417a0f7eb2ed373c6586 100644
--- a/data/json/SkillDefinition/490.json
+++ b/data/json/SkillDefinition/490.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 490,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/494.json b/data/json/SkillDefinition/494.json
index 1cf3b1ac4a2a0405f5047030c6bd71149430b312..d29eb73cc1f34a92905285905982967069d8fea9 100644
--- a/data/json/SkillDefinition/494.json
+++ b/data/json/SkillDefinition/494.json
@@ -20,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/495.json b/data/json/SkillDefinition/495.json
index 353a2cc1e047b4b235f2648fc2a9fe517231cab4..4681acf940b8f573a803b50753fb557706b39e94 100644
--- a/data/json/SkillDefinition/495.json
+++ b/data/json/SkillDefinition/495.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 495,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/496.json b/data/json/SkillDefinition/496.json
index ecfd55bf551ca116db866f3ddd59995c636b2b06..c43b75c029a1affe87365cdc4b1e7635e6489704 100644
--- a/data/json/SkillDefinition/496.json
+++ b/data/json/SkillDefinition/496.json
@@ -5,44 +5,24 @@
     "type": "SkillDefinition",
     "id": 496,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "PerRangeLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "values": [
-            {
-              "k": 1,
-              "v": {
-                "type": "LinearLevelOnlyBasedDynamicValue",
-                "referenceId": "",
-                "baseValue": 0.0,
-                "factor": 15.0
-              }
-            },
-            {
-              "k": 11,
-              "v": {
-                "type": "LinearLevelOnlyBasedDynamicValue",
-                "referenceId": "",
-                "baseValue": -50.0,
-                "factor": 20.0
-              }
-            }
-          ]
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "boost",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "SHIELD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Earth 3 - Bagarreur Prudent",
   "m_availability": 3,
   "m_i18nNameId": 80078,
   "m_i18nDescriptionId": 17187,
-  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/497.json b/data/json/SkillDefinition/497.json
index 5153dfab598d509054d10b916961a5b8905491d3..aa2648b243fea47d0073859635f97f51edec58c2 100644
--- a/data/json/SkillDefinition/497.json
+++ b/data/json/SkillDefinition/497.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 497,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ex",
           "baseValue": 0.0,
-          "factor": 20.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 60
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/50.json b/data/json/SkillDefinition/50.json
index 5d022b81d1e145ba90f372ac4d1592e9d1aaf971..8f674e7ec3ad415ed7db15d4826a6feee6d48b5e 100644
--- a/data/json/SkillDefinition/50.json
+++ b/data/json/SkillDefinition/50.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 50,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/503.json b/data/json/SkillDefinition/503.json
index 8fb264983c9f33926d5dcbf9dabd9ffc72919f6f..1c1e8b9cd2157d4c45aea871580b0fb72f1d7fe2 100644
--- a/data/json/SkillDefinition/503.json
+++ b/data/json/SkillDefinition/503.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 503,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/504.json b/data/json/SkillDefinition/504.json
index 1c88fa5ee839759fc6e378d0d8cd4f684c11c3d6..caabe9b4ba9e12eaf150c817cb7b109d0a240601 100644
--- a/data/json/SkillDefinition/504.json
+++ b/data/json/SkillDefinition/504.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 504,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/505.json b/data/json/SkillDefinition/505.json
index 4fbe16ce2ed0c2113aed5ae2bf32c63270f8c2d4..24f7703dc4ab83185dfca1ecefec91a8987cdc12 100644
--- a/data/json/SkillDefinition/505.json
+++ b/data/json/SkillDefinition/505.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 505,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/506.json b/data/json/SkillDefinition/506.json
index c1f423965b1629799fb1fc62037767d24f191a57..5122a156106f5dd4f2b4c6259f5be5ea661b8f6d 100644
--- a/data/json/SkillDefinition/506.json
+++ b/data/json/SkillDefinition/506.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 506,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/5064.json b/data/json/SkillDefinition/5064.json
index fe1f0f653d4e98a546a688bf6ae96fd7493cab8d..b1bfbcfc6d80b17c2fc343dd9711b4a92d9e9338 100644
--- a/data/json/SkillDefinition/5064.json
+++ b/data/json/SkillDefinition/5064.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 5064,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 40.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 60
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.4
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/507.json b/data/json/SkillDefinition/507.json
index 7077ee180b54ade35c20226df9fb2bc9de20ed7c..021c1c07100c8b6c4ec04c0b7d5e7f9b54bd7f3c 100644
--- a/data/json/SkillDefinition/507.json
+++ b/data/json/SkillDefinition/507.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 507,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/508.json b/data/json/SkillDefinition/508.json
index 65b55a45e9cbab1997717e69e85838fb6ee7ffc1..b3dd9894d62051e80461680223b4a8e3756f5308 100644
--- a/data/json/SkillDefinition/508.json
+++ b/data/json/SkillDefinition/508.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 508,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/51.json b/data/json/SkillDefinition/51.json
index 80d46c324c083f91f7c45d58218f2b9f2fbc7fe7..7458a5dc73d741683dde5bf074f077b2dc0151cd 100644
--- a/data/json/SkillDefinition/51.json
+++ b/data/json/SkillDefinition/51.json
@@ -5,29 +5,27 @@
     "type": "SkillDefinition",
     "id": 51,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 33.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "at",
-          "value": 50
+          "referenceId": "explo",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "EXPLOSION",
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Fire 6 - Archer du Désert",
   "m_availability": 3,
   "m_i18nNameId": 40003,
   "m_i18nDescriptionId": 59376,
-  "assetGuid": "a166ecaedac2d4e42923851e5c208f0c"
+  "assetGuid": "97c1625e918cd4582aa6c800ceb1e7d1"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/511.json b/data/json/SkillDefinition/511.json
index c88138361ad0c82973b342f1e627040a3974dfe1..693024c958554c8d695cc38f3434651ca826b36c 100644
--- a/data/json/SkillDefinition/511.json
+++ b/data/json/SkillDefinition/511.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 511,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/513.json b/data/json/SkillDefinition/513.json
index 85279c5f672751452038e8bb1a78c0b12412812d..c83caa1870ff7ae340abdbc76b9223eb22dfd746 100644
--- a/data/json/SkillDefinition/513.json
+++ b/data/json/SkillDefinition/513.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 513,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 33.33
+          "baseValue": 250.0,
+          "factor": 50.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/514.json b/data/json/SkillDefinition/514.json
index cac755348c3d68636fa5a99c113fcac80d45ecab..00b698ec68f4fa44336e9f0a83fae5115b93e33f 100644
--- a/data/json/SkillDefinition/514.json
+++ b/data/json/SkillDefinition/514.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 514,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/515.json b/data/json/SkillDefinition/515.json
index 255db86191356cd8fe7861edd5391b493db9e255..30afdc4efa23d610d2bfb7bd13b9b5f11eb39076 100644
--- a/data/json/SkillDefinition/515.json
+++ b/data/json/SkillDefinition/515.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 515,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/5158.json b/data/json/SkillDefinition/5158.json
index a6b84003740eec759c35fa7631f5ac50676c95bf..6e40a4bba3c96c08974fbd2820c1562b7cd10a7f 100644
--- a/data/json/SkillDefinition/5158.json
+++ b/data/json/SkillDefinition/5158.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 5158,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 30.0
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": -4
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 60
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 5.0,
+          "factor": 7.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 64642,
   "m_i18nDescriptionId": 97686,
-  "assetGuid": "db8fc7bd1c8cc9447992bdbaf4af602a"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/516.json b/data/json/SkillDefinition/516.json
index 2e953ee525cc8dbee797d963d55e04281374061d..58a8a4a32baab4eae85b5a9a2ee833e93e4a8a36 100644
--- a/data/json/SkillDefinition/516.json
+++ b/data/json/SkillDefinition/516.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 516,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "referenceId": "dmg",
+          "baseValue": 2.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -27,7 +22,7 @@
       ]
     }
   },
-  "m_displayName": "XELOR - Aiguille Pikuxala - Light 1 - Pic Lumineux",
+  "m_displayName": "XELOR - Aiguille Pikuxala - Light 1 - Pic Foudroyant",
   "m_availability": 3,
   "m_i18nNameId": 27439,
   "m_i18nDescriptionId": 85702,
diff --git a/data/json/SkillDefinition/518.json b/data/json/SkillDefinition/518.json
index 5f4582502b3d115e298f9acc05c255413867528b..3b774524e14a803e39ef584d11e16b6240161125 100644
--- a/data/json/SkillDefinition/518.json
+++ b/data/json/SkillDefinition/518.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 518,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -22,7 +22,8 @@
             "referenceId": "",
             "entitySelector": {
               "type": "EffectHolderSelector"
-            }
+            },
+            "usePhysicalPower": true
           }
         }
       ],
diff --git a/data/json/SkillDefinition/519.json b/data/json/SkillDefinition/519.json
index 3cf9dca319172fd21336f2a871e1c6c16af3a0ab..60eb761acdc32d9058ebfd85ae4c357424d0fe30 100644
--- a/data/json/SkillDefinition/519.json
+++ b/data/json/SkillDefinition/519.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 519,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/520.json b/data/json/SkillDefinition/520.json
index fd0d950842e248498a9b0ef4f8a55029dbefcd39..9293c9cfb9fa56d9021b9808262adead119b60a0 100644
--- a/data/json/SkillDefinition/520.json
+++ b/data/json/SkillDefinition/520.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 520,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/521.json b/data/json/SkillDefinition/521.json
index 4292eb24a2dc90d674e24ec5f656dd01e32aadf9..7707874822a4517be5d61dcd29a4d4f6b9f4b856 100644
--- a/data/json/SkillDefinition/521.json
+++ b/data/json/SkillDefinition/521.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 521,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 2.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/524.json b/data/json/SkillDefinition/524.json
index 2fc8d404d2bd0f9fb250406c3968747058467f98..cf989cd4317e5fc6a3235640a05c2d1b57ac2e92 100644
--- a/data/json/SkillDefinition/524.json
+++ b/data/json/SkillDefinition/524.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 524,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/525.json b/data/json/SkillDefinition/525.json
index 953615824c970ebf55ff55f8320ea2a8f3afbf82..8187574fce92f265b6079654170965f6a40532d8 100644
--- a/data/json/SkillDefinition/525.json
+++ b/data/json/SkillDefinition/525.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 525,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 23.33
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 2
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 1
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 0.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 49355,
   "m_i18nDescriptionId": 48937,
-  "assetGuid": "f4628f3d4f70e904f8326c5d15c2310b"
+  "assetGuid": "aebba4430daec0349b1317221a56a144"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/527.json b/data/json/SkillDefinition/527.json
index 7950990c40860e457e682963f8b9dd974b0f534e..5f17e11b2c13980b8e370984ce7158065adc7157 100644
--- a/data/json/SkillDefinition/527.json
+++ b/data/json/SkillDefinition/527.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 2000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 2000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/528.json b/data/json/SkillDefinition/528.json
index 488fbbb762649849ad6acaa1ce6fa1d6612bd149..28febbd53a330b5686d72884ecb7474918982838 100644
--- a/data/json/SkillDefinition/528.json
+++ b/data/json/SkillDefinition/528.json
@@ -8,7 +8,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -17,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/530.json b/data/json/SkillDefinition/530.json
index bd0ad74333615b948e1320dfc58cc948babaea29..f6c0fb732110702e06bf1aa64e7a7e7a7ac3f727 100644
--- a/data/json/SkillDefinition/530.json
+++ b/data/json/SkillDefinition/530.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 530,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/533.json b/data/json/SkillDefinition/533.json
index c17d33c03839fabe664c0f0daba4e92d2cfc5c2c..188d96b1a33a07f861801dc958cbde04710150f2 100644
--- a/data/json/SkillDefinition/533.json
+++ b/data/json/SkillDefinition/533.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 533,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/536.json b/data/json/SkillDefinition/536.json
index b6f9e76e8c717114376c557ebc622509fc7fde30..915872ae33907eafafe77d1227bbb3427fabe9f9 100644
--- a/data/json/SkillDefinition/536.json
+++ b/data/json/SkillDefinition/536.json
@@ -5,19 +5,21 @@
     "type": "SkillDefinition",
     "id": 536,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "baseValue": 5.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "FROZEN",
+        "SIGHT",
         "SHADOWSIGHT"
       ]
     }
diff --git a/data/json/SkillDefinition/537.json b/data/json/SkillDefinition/537.json
index e94bc4d8bcfada005972981a921b745349e59745..512eea3eafeae416ba8b7114260a780ea7920811 100644
--- a/data/json/SkillDefinition/537.json
+++ b/data/json/SkillDefinition/537.json
@@ -5,22 +5,22 @@
     "type": "SkillDefinition",
     "id": 537,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 6.66
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": []
     }
   },
-  "m_displayName": "IOP - Flamboyante Kasaï - Magma 2 - Récupération Minéral",
+  "m_displayName": "IOP - Flamboyante Kasaï - Magma 2 - Récupération Minérale",
   "m_availability": 3,
   "m_i18nNameId": 24388,
   "m_i18nDescriptionId": 75707,
diff --git a/data/json/SkillDefinition/539.json b/data/json/SkillDefinition/539.json
index ecd871b07e917d32dcbec2e39308620e0ea8c58d..a2081981f1c1d6d51a634501db5824d97fdc5048 100644
--- a/data/json/SkillDefinition/539.json
+++ b/data/json/SkillDefinition/539.json
@@ -5,19 +5,22 @@
     "type": "SkillDefinition",
     "id": 539,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 6.66
+          "referenceId": "dmg",
+          "baseValue": 5.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "METEOR",
+        "PHASE"
+      ]
     }
   },
   "m_displayName": "IOP - Larmaguedon Spectral - Magma 1 - Appel du Volcan",
diff --git a/data/json/SkillDefinition/541.json b/data/json/SkillDefinition/541.json
index bc39b09d6b2e049287f556c019242620fe7ac16c..dc91370a136253ed51d5a8138f87a1dba24bda89 100644
--- a/data/json/SkillDefinition/541.json
+++ b/data/json/SkillDefinition/541.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 541,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/543.json b/data/json/SkillDefinition/543.json
index 2569e30711e0115f79339c65b9165e19039e5f06..52ee737fecb69b4e4f5a551d41545f5f5d710a0b 100644
--- a/data/json/SkillDefinition/543.json
+++ b/data/json/SkillDefinition/543.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 543,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "METEOR"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Justelame Brutale - Magma 1 - Bond Ardent",
   "m_availability": 3,
   "m_i18nNameId": 71923,
   "m_i18nDescriptionId": 87382,
-  "assetGuid": "1493478f0ac258d4997720176d928817"
+  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/545.json b/data/json/SkillDefinition/545.json
index 0f67b1b0706d50a5aca9bd6657e02839adf09d08..5468ab538509dd09f5d7557f8f0b3ae7f888660f 100644
--- a/data/json/SkillDefinition/545.json
+++ b/data/json/SkillDefinition/545.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 545,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 5.33
+          "referenceId": "dmg",
+          "baseValue": 2.0,
+          "factor": 1.7
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/5454.json b/data/json/SkillDefinition/5454.json
index 126c4a17751ef29e6ba78818cca679743f76ee27..9c04ab125f041b60f89963e02cfbc1dab1c61ee5 100644
--- a/data/json/SkillDefinition/5454.json
+++ b/data/json/SkillDefinition/5454.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 5454,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/546.json b/data/json/SkillDefinition/546.json
index d6d03ac76ddff1601eb89074e94d63d20641001a..1d86415fc6781845894ecc22beb7bc74e085cd5a 100644
--- a/data/json/SkillDefinition/546.json
+++ b/data/json/SkillDefinition/546.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 546,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/548.json b/data/json/SkillDefinition/548.json
index 0657b5920cc7284f6647cbbbffa082247a1cc0be..3af596cc933788a14fb031dadd79b0469f056b75 100644
--- a/data/json/SkillDefinition/548.json
+++ b/data/json/SkillDefinition/548.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 548,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/549.json b/data/json/SkillDefinition/549.json
index 33e7a6825920d5465d4459bc5ae32e486e7a0a90..daaadfdd113a912b4fbca274400ecc17f69a3f90 100644
--- a/data/json/SkillDefinition/549.json
+++ b/data/json/SkillDefinition/549.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 549,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/55.json b/data/json/SkillDefinition/55.json
index 72f1cf80987e35c191bf752e45021f865fc89466..e7b476157c2f5c3068394d1bef020d05ea7dd41c 100644
--- a/data/json/SkillDefinition/55.json
+++ b/data/json/SkillDefinition/55.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 55,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/550.json b/data/json/SkillDefinition/550.json
index 3f58a66a5d476bba341ff2b265391b83b3b940a2..696a674d7ce828074113989c05778933c0ab020c 100644
--- a/data/json/SkillDefinition/550.json
+++ b/data/json/SkillDefinition/550.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 550,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/553.json b/data/json/SkillDefinition/553.json
index b2ceab948527b6de3344f14fff6d79d13a89cb34..9560a7ab4d873a53a3cb922c8de61ea12f6ba7e7 100644
--- a/data/json/SkillDefinition/553.json
+++ b/data/json/SkillDefinition/553.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 553,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 5
+          "value": -5
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "ar",
+          "baseValue": 3.0,
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "METEOR"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Synchronisateur Tako - Magma 2 - Accumulation Magmatique",
diff --git a/data/json/SkillDefinition/554.json b/data/json/SkillDefinition/554.json
index 7c5830113583ee469e9a2fdc8eb23cd898928d65..f27220e8e117e790c0b017eaf8dcface6f7cbb43 100644
--- a/data/json/SkillDefinition/554.json
+++ b/data/json/SkillDefinition/554.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 554,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/555.json b/data/json/SkillDefinition/555.json
index 27be6ea688f0b31b0a02792d4c72ebfb6d349eeb..22a1de269521f79260eccbe0de375b6a309b4da5 100644
--- a/data/json/SkillDefinition/555.json
+++ b/data/json/SkillDefinition/555.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 555,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 3.667
+          "factor": 1.4
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/559.json b/data/json/SkillDefinition/559.json
index 5e2d599d453d6c9bdac83a7bedd4b94f95e55d3d..fb8ce04960e119e516b1cdcae317346940efd3e3 100644
--- a/data/json/SkillDefinition/559.json
+++ b/data/json/SkillDefinition/559.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 559,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,11 +13,12 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 5.33
+          "factor": 10.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "SIGHT",
         "LIGHTNINGSIGHT"
       ]
     }
diff --git a/data/json/SkillDefinition/56.json b/data/json/SkillDefinition/56.json
index 26bff11cb1cf901459542e9970ad8317f6015e39..ecdcd8c3ea25e26fc55b4617979119221df25ec4 100644
--- a/data/json/SkillDefinition/56.json
+++ b/data/json/SkillDefinition/56.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 56,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 50.0
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
@@ -24,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 43894,
   "m_i18nDescriptionId": 7300,
-  "assetGuid": "4c1ebbaad54d1cc48805f9fe8b1eb31f"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/560.json b/data/json/SkillDefinition/560.json
index c21dcdc503ff1a3e0a391684bb153838bdeac6ab..ab8e6487cafe04754ed8852cb7b796a897402405 100644
--- a/data/json/SkillDefinition/560.json
+++ b/data/json/SkillDefinition/560.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 560,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/564.json b/data/json/SkillDefinition/564.json
index 177b0bde3eae9d1ef80088c344336e4b93940c00..aa60ce47362c6be443d504cf4d791f253e41ac1d 100644
--- a/data/json/SkillDefinition/564.json
+++ b/data/json/SkillDefinition/564.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 564,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/565.json b/data/json/SkillDefinition/565.json
index e7660bb833d7795017a97952ff7028cf6e097bae..73fe40ce993733cd9e963bec16811a781b61a908 100644
--- a/data/json/SkillDefinition/565.json
+++ b/data/json/SkillDefinition/565.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 565,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
+          "referenceId": "pv",
+          "baseValue": 1.0,
           "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Justelame Brutale - Dark 1 - Bond Malfaisant",
   "m_availability": 3,
   "m_i18nNameId": 12534,
   "m_i18nDescriptionId": 76277,
-  "assetGuid": "1924e787deef5d14fa075790688d48bb"
+  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/567.json b/data/json/SkillDefinition/567.json
index 607c43e30a80565e7765b18398ba0d9761e3b40f..a0e3c1398c7c57d3f11a8849fac42ffdf209fd12 100644
--- a/data/json/SkillDefinition/567.json
+++ b/data/json/SkillDefinition/567.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 567,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/568.json b/data/json/SkillDefinition/568.json
index bd16d83af0b78531125b9a1fd62b01ce75323260..bb3c9c1fe7683c0ea0638ee33f0fbf0fa6c9b80e 100644
--- a/data/json/SkillDefinition/568.json
+++ b/data/json/SkillDefinition/568.json
@@ -5,26 +5,27 @@
     "type": "SkillDefinition",
     "id": 568,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 0.0,
-          "factor": 3.0
+          "referenceId": "perc",
+          "baseValue": 2.5,
+          "factor": 1.5
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "referenceId": "ar",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
         "METEOR",
+        "UNIQUE",
         {
           "type": 4,
           "id": 350
diff --git a/data/json/SkillDefinition/57.json b/data/json/SkillDefinition/57.json
index 3885c20bbd72f233afbe9488d98147f2612a368c..c7fb7a9bf3434c94fe262491cea4c0a73e6f5d7a 100644
--- a/data/json/SkillDefinition/57.json
+++ b/data/json/SkillDefinition/57.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 57,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/574.json b/data/json/SkillDefinition/574.json
index 425b9832444bbd09f85b528590ae42368a4eeb06..0228b26a8fab7e3ce1f8aba68cb432665b428f61 100644
--- a/data/json/SkillDefinition/574.json
+++ b/data/json/SkillDefinition/574.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 574,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/575.json b/data/json/SkillDefinition/575.json
index 867c4b67fd8faae2656c6ece3e140b45fb61b379..08ed74fdd39d18d890a4b2de49c43d44dd2420e4 100644
--- a/data/json/SkillDefinition/575.json
+++ b/data/json/SkillDefinition/575.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 575,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/576.json b/data/json/SkillDefinition/576.json
index 1de2ca4791e56ff6dce922d021e295ca975c845f..c9b5b99a314ecff7bf74dc655e00aaf1bc66d2a7 100644
--- a/data/json/SkillDefinition/576.json
+++ b/data/json/SkillDefinition/576.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 576,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/577.json b/data/json/SkillDefinition/577.json
index 233f7fe09e7a85a451580cf80e3f9e763525b21a..0e9b8d064af9091d7641fc16ff0d1607aa6d9e04 100644
--- a/data/json/SkillDefinition/577.json
+++ b/data/json/SkillDefinition/577.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 577,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/578.json b/data/json/SkillDefinition/578.json
index de8d0128ee19fb2607268d47c601a5f0f3b33eb0..d5bb5fb481a41791e096a399472a6c1d689fcde6 100644
--- a/data/json/SkillDefinition/578.json
+++ b/data/json/SkillDefinition/578.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 578,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/579.json b/data/json/SkillDefinition/579.json
index acfaa189171cf2927330beb707dbaf70ba6308f2..00236f8e8237baec9a99fef1e4e592b8fab3ea29 100644
--- a/data/json/SkillDefinition/579.json
+++ b/data/json/SkillDefinition/579.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 579,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/58.json b/data/json/SkillDefinition/58.json
index 7110356ad3d868cf4a14c3529ab7ee97c92cfac8..8df69d0080c5472bddaa2e5b54ea04134b0f247a 100644
--- a/data/json/SkillDefinition/58.json
+++ b/data/json/SkillDefinition/58.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 58,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/580.json b/data/json/SkillDefinition/580.json
index 41e8caa1f276a4f27fcdca27f6f03c17090fea77..7973c845dc85c98ea057b46af99e42bcc99adf86 100644
--- a/data/json/SkillDefinition/580.json
+++ b/data/json/SkillDefinition/580.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 580,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/581.json b/data/json/SkillDefinition/581.json
index 5890dafe67fd7b37cab87e79690aff0a965f0ba9..64fdf805d1db94dca1d89b57bd369d7fea22f4a6 100644
--- a/data/json/SkillDefinition/581.json
+++ b/data/json/SkillDefinition/581.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 581,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/582.json b/data/json/SkillDefinition/582.json
index 398769588d44b81e2517ab48f5b8a6c96207dbfd..b6fcd705d4a54185765ae80df226e385db8b8821 100644
--- a/data/json/SkillDefinition/582.json
+++ b/data/json/SkillDefinition/582.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 582,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/583.json b/data/json/SkillDefinition/583.json
index e6242d41bb8eab4b170eb84b6189a39a7648d88e..198d90c8e1bc5c4ec60c2027c66cfc680f018ee9 100644
--- a/data/json/SkillDefinition/583.json
+++ b/data/json/SkillDefinition/583.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 583,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/584.json b/data/json/SkillDefinition/584.json
index f9337c1e3ec2fffa6c439aa3191558552c14bd08..7514a19f0c806838378aa661fad37d801b090ba4 100644
--- a/data/json/SkillDefinition/584.json
+++ b/data/json/SkillDefinition/584.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 584,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/585.json b/data/json/SkillDefinition/585.json
index 9c0efc25d7c285f8fd2ab4c8c341fdcd79ad1bb4..f0eaa17385f6b7b4befbf92fe0d07e064225e62f 100644
--- a/data/json/SkillDefinition/585.json
+++ b/data/json/SkillDefinition/585.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 585,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/59.json b/data/json/SkillDefinition/59.json
index 024da37a5f50c9a9bc54becc70f4ed69d889cf2a..4a5afc4e5d26ec559ec7b9551635ef8095aa4ed1 100644
--- a/data/json/SkillDefinition/59.json
+++ b/data/json/SkillDefinition/59.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 59,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/590.json b/data/json/SkillDefinition/590.json
index 1274b3a44a7f2cd35ac879bd463feed3ab776839..6c10116e69cac4a527dd967c5f39b4ef04364445 100644
--- a/data/json/SkillDefinition/590.json
+++ b/data/json/SkillDefinition/590.json
@@ -5,37 +5,15 @@
     "type": "SkillDefinition",
     "id": 590,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 40.0
-        },
-        {
-          "type": "PercentageOfValue",
-          "referenceId": "total",
-          "percentage": {
-            "type": "ConstIntegerValue",
-            "referenceId": "percAt",
-            "value": 30
-          },
-          "from": {
-            "type": "EntityBaseCaracValue",
-            "referenceId": "",
-            "entitySelector": {
-              "type": "EffectHolderSelector"
-            },
-            "carac": 15
-          }
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 30
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -46,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 93390,
   "m_i18nDescriptionId": 86168,
-  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
+  "assetGuid": "db8fc7bd1c8cc9447992bdbaf4af602a"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/591.json b/data/json/SkillDefinition/591.json
index d834d8308b7d87d57422d02a55f1f61335be84ad..637a8270aaf2d7d5bfbcc3a258ad495e90f05ae8 100644
--- a/data/json/SkillDefinition/591.json
+++ b/data/json/SkillDefinition/591.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 591,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/60.json b/data/json/SkillDefinition/60.json
index e5321d9f78cdd6ad6b1ac269dfd2cc4c5aa29b99..558d0c81aa3541e13c496d392623af6855426348 100644
--- a/data/json/SkillDefinition/60.json
+++ b/data/json/SkillDefinition/60.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 60,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/6034.json b/data/json/SkillDefinition/6034.json
index f32a6cc7c8bad24a4b351e804fecd40ea93500f6..349f6ec780aa1c2e0bf0f8efd258dea99846a9fc 100644
--- a/data/json/SkillDefinition/6034.json
+++ b/data/json/SkillDefinition/6034.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 6034,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/606.json b/data/json/SkillDefinition/606.json
index 002075c42129914290da842a2713b4211f687548..3889719a5d35fae309a5823894a8598454c9e855 100644
--- a/data/json/SkillDefinition/606.json
+++ b/data/json/SkillDefinition/606.json
@@ -8,7 +8,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -17,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/609.json b/data/json/SkillDefinition/609.json
index 1aa61441eaa840572c3ee46e89ded9766d7bc8a8..ff65442c3b963f817c678b618212ab10a4519798 100644
--- a/data/json/SkillDefinition/609.json
+++ b/data/json/SkillDefinition/609.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 609,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/610.json b/data/json/SkillDefinition/610.json
index 2884d3e53bb06bc13146645b8d6b2e7cfac67d57..a12ab0c9b075edf3f2178683a51491a25a044f29 100644
--- a/data/json/SkillDefinition/610.json
+++ b/data/json/SkillDefinition/610.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 610,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/611.json b/data/json/SkillDefinition/611.json
index 60712c0ac0761545bafcff36381036a161f77a5f..58655d52fcc9ec403ef8426a8c07332560f3cdf7 100644
--- a/data/json/SkillDefinition/611.json
+++ b/data/json/SkillDefinition/611.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 611,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/612.json b/data/json/SkillDefinition/612.json
index c5f386202f4844c33cc244933974d676259aed3b..3949308296f954a28b9f24d7c50ad59a21dab25b 100644
--- a/data/json/SkillDefinition/612.json
+++ b/data/json/SkillDefinition/612.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 612,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/614.json b/data/json/SkillDefinition/614.json
index 90ade80b871a7b3e80f1a35a85b3f3b5307593a1..c1da3c52c758d7821d1e77fb178058340174336e 100644
--- a/data/json/SkillDefinition/614.json
+++ b/data/json/SkillDefinition/614.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 614,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 23.33
+          "baseValue": 250.0,
+          "factor": 50.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "ROOTED"
+        "SHIELD"
       ]
     }
   },
@@ -26,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 34262,
   "m_i18nDescriptionId": 44848,
-  "assetGuid": "442efd24ea6747d48907d6e141c57455"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/616.json b/data/json/SkillDefinition/616.json
index e68f7ca5cd260732b4fa5faafbd8931dc0f049ae..76992d21b2113b39750a8023ed7e24cbf9e62043 100644
--- a/data/json/SkillDefinition/616.json
+++ b/data/json/SkillDefinition/616.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 616,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/617.json b/data/json/SkillDefinition/617.json
index 4ca77d86297c72365ebeb0f420f23c44104576cf..35a34664ec0c4e433395e48d0ee2306b52300d33 100644
--- a/data/json/SkillDefinition/617.json
+++ b/data/json/SkillDefinition/617.json
@@ -5,25 +5,20 @@
     "type": "SkillDefinition",
     "id": 617,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 16.67
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "at",
-          "value": 50
+          "referenceId": "dmg",
+          "baseValue": 3.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EXPLOSION"
+        "SIGHT"
       ]
     }
   },
@@ -31,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 70014,
   "m_i18nDescriptionId": 68003,
-  "assetGuid": "8166634905ee6894c98e3d265a95df9d"
+  "assetGuid": "db8fc7bd1c8cc9447992bdbaf4af602a"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/62.json b/data/json/SkillDefinition/62.json
index d33d485b98cd7f84c07b80435414ad9769ed45aa..59a4592aae15e4e9e34ff88674c6ea0f6743866f 100644
--- a/data/json/SkillDefinition/62.json
+++ b/data/json/SkillDefinition/62.json
@@ -5,31 +5,19 @@
     "type": "SkillDefinition",
     "id": 62,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "magic",
+          "baseValue": 5.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Catalysateur Pramium - Empty 2 - Rouage Vide",
diff --git a/data/json/SkillDefinition/620.json b/data/json/SkillDefinition/620.json
index 489e68610d6b3e4591cc9821c4e27321d9c88dcb..1f95813660e60593e35f3906202bcc782a9e7d6d 100644
--- a/data/json/SkillDefinition/620.json
+++ b/data/json/SkillDefinition/620.json
@@ -5,26 +5,29 @@
     "type": "SkillDefinition",
     "id": 620,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "nb",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.667
+          "referenceId": "buffP",
+          "baseValue": 2.5,
+          "factor": 6.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "BOUNCE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Bunelame - Light 2 - Écho Radieux",
   "m_availability": 3,
   "m_i18nNameId": 83377,
   "m_i18nDescriptionId": 75421,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/621.json b/data/json/SkillDefinition/621.json
index ebc95a1de4043d7a23a7570da809aa232ffcda43..3d4708afc3d41f3026d7b48291753ffe0a6ed5a1 100644
--- a/data/json/SkillDefinition/621.json
+++ b/data/json/SkillDefinition/621.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 200
+          "value": 4000
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 50
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 200
+          "value": 4000
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 50
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/622.json b/data/json/SkillDefinition/622.json
index 61dc574d49b9fd0ae36f32448a01e03f074da964..07b5b3026ea21188ba52bb1ac030afd6b9742552 100644
--- a/data/json/SkillDefinition/622.json
+++ b/data/json/SkillDefinition/622.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 622,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/623.json b/data/json/SkillDefinition/623.json
index d0ed040abda515f243dac8f81094e613be7dc4a6..0c48a7ea06c3dfb3d35418db2bf55e20b0e5f76f 100644
--- a/data/json/SkillDefinition/623.json
+++ b/data/json/SkillDefinition/623.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 623,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/624.json b/data/json/SkillDefinition/624.json
index 980ce3a40009d787156909df310216d4226eb142..7628421400a5e6fa3cc5a9c16f4e96997a25d426 100644
--- a/data/json/SkillDefinition/624.json
+++ b/data/json/SkillDefinition/624.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 624,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/625.json b/data/json/SkillDefinition/625.json
index e96183a8b13924306b068a0e74cd693f680278c4..3c26aa2d5012c6d969e7254176bf90ffe536d0bf 100644
--- a/data/json/SkillDefinition/625.json
+++ b/data/json/SkillDefinition/625.json
@@ -5,30 +5,31 @@
     "type": "SkillDefinition",
     "id": 625,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.333
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 2
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc2",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "ar",
+          "baseValue": 0.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Expingole - Magma 2 - Assaut Volcanique",
   "m_availability": 3,
   "m_i18nNameId": 80903,
   "m_i18nDescriptionId": 14334,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/626.json b/data/json/SkillDefinition/626.json
index 0d0be02545316fe7b782936b2f3f894d654d70dd..20dd1d44ad9c440b6eb0a455b0402d1cf8a2d33a 100644
--- a/data/json/SkillDefinition/626.json
+++ b/data/json/SkillDefinition/626.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 626,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/627.json b/data/json/SkillDefinition/627.json
index a0f4c2065f0c91493916b06b9253457a7099e33d..eb8ee373574dbb7a7428836f0e93a91aa97ef171 100644
--- a/data/json/SkillDefinition/627.json
+++ b/data/json/SkillDefinition/627.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 627,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/629.json b/data/json/SkillDefinition/629.json
index 44438de6d2d03398611877b34c93c1c3d73b4d9f..6a055d4c64220f317aec63624aee00830f58f125 100644
--- a/data/json/SkillDefinition/629.json
+++ b/data/json/SkillDefinition/629.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 629,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/63.json b/data/json/SkillDefinition/63.json
index 5a9739c5409b4973441f649b6461eb20d86844a9..d0f9cdd5d80e5598016642f35026ba181fb0a07c 100644
--- a/data/json/SkillDefinition/63.json
+++ b/data/json/SkillDefinition/63.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 63,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/630.json b/data/json/SkillDefinition/630.json
index 649121037c04cd46cfda7cb48d636fed97e414f4..16d2eed40ad7e8473dc0171b6121fa0d9aac5e82 100644
--- a/data/json/SkillDefinition/630.json
+++ b/data/json/SkillDefinition/630.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 630,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/632.json b/data/json/SkillDefinition/632.json
index b51982a32378b205f7cb5f1380341901c9c2620f..9397b8c2bc859cac269cce46b99d7fd1d49ea8a2 100644
--- a/data/json/SkillDefinition/632.json
+++ b/data/json/SkillDefinition/632.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 632,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/634.json b/data/json/SkillDefinition/634.json
index 96b6850fd7c55d6f3694d498d61ca0571a0bbfe7..6fd4f77433ba1515550c4c2e2ef2c6bd55fd7b6f 100644
--- a/data/json/SkillDefinition/634.json
+++ b/data/json/SkillDefinition/634.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 634,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/636.json b/data/json/SkillDefinition/636.json
index 456dfaec67210b5e6c2520143e3addf92e47d7d4..09512b2d0c17f8256a2f21882776745249960953 100644
--- a/data/json/SkillDefinition/636.json
+++ b/data/json/SkillDefinition/636.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 2000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 100
+          "value": 2000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/638.json b/data/json/SkillDefinition/638.json
index 398902c387e2028040008fbd37923a562e40e907..461ef42d2ededb69eb486bc8aaba6523816ff123 100644
--- a/data/json/SkillDefinition/638.json
+++ b/data/json/SkillDefinition/638.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 638,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 4.33
+          "baseValue": 1.0,
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
@@ -26,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 79145,
   "m_i18nDescriptionId": 35220,
-  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
+  "assetGuid": "a52adb3fac6a36c409301e33bf8c5b82"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/639.json b/data/json/SkillDefinition/639.json
index 0b01601d70ab5853ea1634b8d966afbaa611de5a..e002954213e38200c6054e6261354e615a9da439 100644
--- a/data/json/SkillDefinition/639.json
+++ b/data/json/SkillDefinition/639.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 639,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 26.67
+          "baseValue": 250.0,
+          "factor": 50.0
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "aura",
-          "value": 2
+          "value": 1
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "WINDSWORD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Air 6 - Bretteur du Ciel",
diff --git a/data/json/SkillDefinition/64.json b/data/json/SkillDefinition/64.json
index 4abfb386973d2b196899f671acd886b43d953372..c4b143aa54e37185acde3d7eef6b9b4bddbcc726 100644
--- a/data/json/SkillDefinition/64.json
+++ b/data/json/SkillDefinition/64.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 64,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/640.json b/data/json/SkillDefinition/640.json
index 1f241393362db5c41e3769ad1401e96dd812aedd..0066983d3cedc96ae856df9b90fe74391f0a261a 100644
--- a/data/json/SkillDefinition/640.json
+++ b/data/json/SkillDefinition/640.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 640,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/642.json b/data/json/SkillDefinition/642.json
index dae947190614d8136dac2627a7e9b4aec227b83c..cc2fa33ef372fcc26b8c8e4e5abee80eb6af8850 100644
--- a/data/json/SkillDefinition/642.json
+++ b/data/json/SkillDefinition/642.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 642,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/645.json b/data/json/SkillDefinition/645.json
index 2e3e8ddfc1bdb489371f45568c47b5bc49724840..cd03baa2be8d11e2105094e1f0887f6e05a96db2 100644
--- a/data/json/SkillDefinition/645.json
+++ b/data/json/SkillDefinition/645.json
@@ -5,26 +5,29 @@
     "type": "SkillDefinition",
     "id": 645,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 50.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "SHIELD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Earth 4 - Étude de la Montagne",
   "m_availability": 3,
   "m_i18nNameId": 71096,
   "m_i18nDescriptionId": 3497,
-  "assetGuid": "70f22663fbc48f84f83fe252c2db2885"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/6461.json b/data/json/SkillDefinition/6461.json
index aa30a4c18be9e140eaba8053319d3a7e0c956c79..3e636e400d08d39a603c565c1d8e651d2270d216 100644
--- a/data/json/SkillDefinition/6461.json
+++ b/data/json/SkillDefinition/6461.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 6461,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/648.json b/data/json/SkillDefinition/648.json
index 51be644956d5da4d829a45ddd45735bdabfb3173..a5387edc87597e7bf6b2df6b48d907520bd7284f 100644
--- a/data/json/SkillDefinition/648.json
+++ b/data/json/SkillDefinition/648.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 648,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/649.json b/data/json/SkillDefinition/649.json
index 6a59466cd41f82a3db434694e23c287f2ceb380d..402ee233d270526c4c2ec93ae34a14bf8698cb9b 100644
--- a/data/json/SkillDefinition/649.json
+++ b/data/json/SkillDefinition/649.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 649,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/65.json b/data/json/SkillDefinition/65.json
index 6483887304bb137baedc6390e099d891e4c0805f..f9c7acd72d1ae21ee7ab886d42172d74d8b47fc3 100644
--- a/data/json/SkillDefinition/65.json
+++ b/data/json/SkillDefinition/65.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 65,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/650.json b/data/json/SkillDefinition/650.json
index 448fb81464330c46b1ebe1d213ecb7f7c9a7905d..17454b30ae3847070012e359cf2692ce09aed42c 100644
--- a/data/json/SkillDefinition/650.json
+++ b/data/json/SkillDefinition/650.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 650,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/651.json b/data/json/SkillDefinition/651.json
index e8c657044f85547b5c43347b139b159cae90583f..bce287435da8a6d513f6f992364fd7cebd071b54 100644
--- a/data/json/SkillDefinition/651.json
+++ b/data/json/SkillDefinition/651.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 651,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/653.json b/data/json/SkillDefinition/653.json
index 0406836d9d408b65f3e415d8ff6da6dfd3a3632c..14cb79748eceec723f7580704f10502eec2bcf4f 100644
--- a/data/json/SkillDefinition/653.json
+++ b/data/json/SkillDefinition/653.json
@@ -5,27 +5,25 @@
     "type": "SkillDefinition",
     "id": 653,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        }
+        "SIGHT"
       ]
     }
   },
@@ -33,5 +31,5 @@
   "m_availability": 3,
   "m_i18nNameId": 31417,
   "m_i18nDescriptionId": 37146,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/654.json b/data/json/SkillDefinition/654.json
index 962569227ee54c07ad7e90042ceeb9a50518acca..6b92e989159c95189e4d5dc0558aa53654974f5e 100644
--- a/data/json/SkillDefinition/654.json
+++ b/data/json/SkillDefinition/654.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 654,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/655.json b/data/json/SkillDefinition/655.json
index 2186343a97743e6c1a723d36c66542c875af330d..8711cd4f844845bfc6634dd6833de29dffb8d08e 100644
--- a/data/json/SkillDefinition/655.json
+++ b/data/json/SkillDefinition/655.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 655,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 26.67
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 1
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "aura",
-          "value": 2
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "ar",
+          "baseValue": 0.0,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "STONESWORD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Earth 6 - Bretteur des Landes",
diff --git a/data/json/SkillDefinition/657.json b/data/json/SkillDefinition/657.json
index 1ddfa4f692ea901fbc953d9d3e9412239b50679e..50d64795d28cab1c27bbf7f9e2b58e470518c7ac 100644
--- a/data/json/SkillDefinition/657.json
+++ b/data/json/SkillDefinition/657.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 657,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/661.json b/data/json/SkillDefinition/661.json
index 2e7db2d8396526357581089a40ba23e08d94177b..def7eecbcfd5a2f2dc1d4ce35510cba69d5a0781 100644
--- a/data/json/SkillDefinition/661.json
+++ b/data/json/SkillDefinition/661.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 661,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/662.json b/data/json/SkillDefinition/662.json
index 081dcdff6fdf8ef099fd28fc325fec69ca51f0f3..29746ff61586dd1b27528eca979a7dd6d3fcb064 100644
--- a/data/json/SkillDefinition/662.json
+++ b/data/json/SkillDefinition/662.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 662,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "ar",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/663.json b/data/json/SkillDefinition/663.json
index ad8213764a7d981a3cbaae5e4bff6e2b7771ecad..3a6cfba1989341c9f7631f25aa7267a38f2d5e80 100644
--- a/data/json/SkillDefinition/663.json
+++ b/data/json/SkillDefinition/663.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 663,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/664.json b/data/json/SkillDefinition/664.json
index 270b0fed2c1983719bf0a93badf9299ffb90c09c..66df080c75139a88eb6e0a126d7a93e0ab3d8d8f 100644
--- a/data/json/SkillDefinition/664.json
+++ b/data/json/SkillDefinition/664.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             75
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 150
+          "value": 1500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 150
+          "value": 1500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/666.json b/data/json/SkillDefinition/666.json
index b450214e96acebcd57bd10754d5a83387b3ec40e..88788678d9588b30dcbc686ec671d8b2aae55d1d 100644
--- a/data/json/SkillDefinition/666.json
+++ b/data/json/SkillDefinition/666.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 666,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/668.json b/data/json/SkillDefinition/668.json
index 5d67450918e667ecf9f4df2d1979a32125f01587..848b38fd6f8b8a6e60b4885485541382e3def2eb 100644
--- a/data/json/SkillDefinition/668.json
+++ b/data/json/SkillDefinition/668.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 668,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/669.json b/data/json/SkillDefinition/669.json
index 481bff5d8c0cecf164d80c5b4ff5f111267004a5..a17dd084a99d8d1852cb9568852feaf978e4e639 100644
--- a/data/json/SkillDefinition/669.json
+++ b/data/json/SkillDefinition/669.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 669,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/670.json b/data/json/SkillDefinition/670.json
index 86ed18b0eb8547fb64bac3692bffd19bdd327919..56db91c9bd78d3e7265b850e6794294a94e5edf2 100644
--- a/data/json/SkillDefinition/670.json
+++ b/data/json/SkillDefinition/670.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 670,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/671.json b/data/json/SkillDefinition/671.json
index 9232ea2fa6c932d1edd9c4e92364dced6d3b49f6..28a07c09729944fd3c897e4c002ec7cde736506b 100644
--- a/data/json/SkillDefinition/671.json
+++ b/data/json/SkillDefinition/671.json
@@ -5,31 +5,24 @@
     "type": "SkillDefinition",
     "id": 671,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "at",
+          "baseValue": 2.5,
+          "factor": 2.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Bouvaloir Orok - Light 1 - Traînée Lumineuse",
   "m_availability": 3,
   "m_i18nNameId": 79360,
   "m_i18nDescriptionId": 45257,
-  "assetGuid": "a52adb3fac6a36c409301e33bf8c5b82"
+  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/674.json b/data/json/SkillDefinition/674.json
index e193cd36fecffcce08c18683eeab0d5ed00f597e..8b6c9d7010149b08b6bb6de044086e63205917a4 100644
--- a/data/json/SkillDefinition/674.json
+++ b/data/json/SkillDefinition/674.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 674,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/677.json b/data/json/SkillDefinition/677.json
index 952614a4e4c746f402bf7464caad525483355c2d..2d623f24a4bfccb4e54a2598d3248cc969f6218d 100644
--- a/data/json/SkillDefinition/677.json
+++ b/data/json/SkillDefinition/677.json
@@ -17,7 +17,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/6775.json b/data/json/SkillDefinition/6775.json
index d690c4aa8e4c228d333f09d7336ab67dfc71b040..41d269cb51e20783b5f48e9173c79f8e0362052a 100644
--- a/data/json/SkillDefinition/6775.json
+++ b/data/json/SkillDefinition/6775.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 6775,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/679.json b/data/json/SkillDefinition/679.json
index a4d70e444f92667d4484089746b86670f4a53650..c551a1c4cc10fde2a688bffa960afaf10d2969ce 100644
--- a/data/json/SkillDefinition/679.json
+++ b/data/json/SkillDefinition/679.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 679,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/6809.json b/data/json/SkillDefinition/6809.json
index a49f372af2766b24cc021e932d8ab060d5db2fd6..adb1579bc45012d0fbc062483f057bbe8098f63e 100644
--- a/data/json/SkillDefinition/6809.json
+++ b/data/json/SkillDefinition/6809.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 6809,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/681.json b/data/json/SkillDefinition/681.json
index 334c518b0941c3c6470789058f8131974aaf69d8..e0af0324f2aa2f2d1ee81389bbe1290e0b4bdfa6 100644
--- a/data/json/SkillDefinition/681.json
+++ b/data/json/SkillDefinition/681.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 681,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/682.json b/data/json/SkillDefinition/682.json
index 0448bcd214fe88c78af8c63187adbfaf6a4ae452..66f9eceecc34910899277b726941537e9e54bc91 100644
--- a/data/json/SkillDefinition/682.json
+++ b/data/json/SkillDefinition/682.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 682,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/683.json b/data/json/SkillDefinition/683.json
index 33ab67265483aa4204199c266ff0daecec6d3eed..0127dae5f8076a408166bb89ed1f3af4f3a4ca2c 100644
--- a/data/json/SkillDefinition/683.json
+++ b/data/json/SkillDefinition/683.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 683,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/684.json b/data/json/SkillDefinition/684.json
index 58d190a70df3afc26b62eb7019753bc02066d1a3..7dbd0e8b274172def402a5aa67296dc427e00db0 100644
--- a/data/json/SkillDefinition/684.json
+++ b/data/json/SkillDefinition/684.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 684,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/685.json b/data/json/SkillDefinition/685.json
index 754c18d76827db7173c4d48f2327e5eff98de919..5ab40867c94bee41c3348808a5ae2cb3d69bb14e 100644
--- a/data/json/SkillDefinition/685.json
+++ b/data/json/SkillDefinition/685.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 685,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 20.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 40
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 82071,
   "m_i18nDescriptionId": 63530,
-  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/686.json b/data/json/SkillDefinition/686.json
index 61eb44a3209cd4ae2f809e637708a8eadada2edf..15cea7c61fa2335eaee135e338c02870a3a8b71d 100644
--- a/data/json/SkillDefinition/686.json
+++ b/data/json/SkillDefinition/686.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 686,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 2.0
+          "factor": 1.1
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/691.json b/data/json/SkillDefinition/691.json
index b64cb32f7f0ed77f416cbb0ed6a38461a27032de..7129128402458672457c789963ca545932520b9a 100644
--- a/data/json/SkillDefinition/691.json
+++ b/data/json/SkillDefinition/691.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 691,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/695.json b/data/json/SkillDefinition/695.json
index 0895b95a0d21b1cb55280851e70fe4746162fb77..494659e640df452db13bce502ae06f699dcb63b6 100644
--- a/data/json/SkillDefinition/695.json
+++ b/data/json/SkillDefinition/695.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 695,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/696.json b/data/json/SkillDefinition/696.json
index afa9e4cb12f81aa1bae2dcae897dcd84c298c213..851eb828344f145413e70c6efb617c0cdf6453c9 100644
--- a/data/json/SkillDefinition/696.json
+++ b/data/json/SkillDefinition/696.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 696,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/697.json b/data/json/SkillDefinition/697.json
index 6aebf0b219f5fc7cc4bd1ab2c2e401d5b0be8428..da378642f28369884a8565d201093f31a828c3ec 100644
--- a/data/json/SkillDefinition/697.json
+++ b/data/json/SkillDefinition/697.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 697,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/698.json b/data/json/SkillDefinition/698.json
index 0cffc6c998a9224aed49123850c80ceeffe51f04..e4d381873fc49d29c4d6d0a6853a519c224fd8a9 100644
--- a/data/json/SkillDefinition/698.json
+++ b/data/json/SkillDefinition/698.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 250
+          "value": 5000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 250
+          "value": 5000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/699.json b/data/json/SkillDefinition/699.json
index 4d56cd6a593131f80a318e9cebb1c861bae96ad4..fbef9fdbe2096c3491a8e962303682a9b3106017 100644
--- a/data/json/SkillDefinition/699.json
+++ b/data/json/SkillDefinition/699.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 699,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.667
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/70.json b/data/json/SkillDefinition/70.json
index 134492193ed2af05ce49d2e41414e2252ec684a8..aedbeaea16f8a57df5fd25e138db8fdd0db0ba6a 100644
--- a/data/json/SkillDefinition/70.json
+++ b/data/json/SkillDefinition/70.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 70,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/700.json b/data/json/SkillDefinition/700.json
index c1130351ecd2e9d9a055a08ff6a510debb0169b1..688491d9380ca4e8683b7c2b35c81ae24b48f1ba 100644
--- a/data/json/SkillDefinition/700.json
+++ b/data/json/SkillDefinition/700.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 700,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/701.json b/data/json/SkillDefinition/701.json
index 4c43143d2606361477f59a7c6b0686d73c936ef3..1e367315e8c7d43388ffadea41a8e2bd01312895 100644
--- a/data/json/SkillDefinition/701.json
+++ b/data/json/SkillDefinition/701.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 701,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/702.json b/data/json/SkillDefinition/702.json
index 8230c52c28290e81ff384880b9cb2c2a0f5c3135..2fcb48f3dd695757f54d6fef1f7b721a171a95f7 100644
--- a/data/json/SkillDefinition/702.json
+++ b/data/json/SkillDefinition/702.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 702,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/704.json b/data/json/SkillDefinition/704.json
index d0544414a2f2bf23cfe3d8891edcaa5f5c971aeb..b71376c4043cfe244b50d94b051cda29afec5598 100644
--- a/data/json/SkillDefinition/704.json
+++ b/data/json/SkillDefinition/704.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 704,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "dmg",
+          "baseValue": 5.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Justelame Brutale - Empty 1 - Bond Silencieux",
   "m_availability": 3,
   "m_i18nNameId": 44570,
   "m_i18nDescriptionId": 2502,
-  "assetGuid": "9085b25ad140f5f4c869893f5f173030"
+  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/706.json b/data/json/SkillDefinition/706.json
index 347606b963110158ef3d87c61a1616683986af9e..b0171b7eb65ced4321f6f4a04559f63847762eaf 100644
--- a/data/json/SkillDefinition/706.json
+++ b/data/json/SkillDefinition/706.json
@@ -5,24 +5,31 @@
     "type": "SkillDefinition",
     "id": 706,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 3.0
+          "factor": 1.9
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "METEOR"
+      ]
     }
   },
   "m_displayName": "IOP - Justelame Brutale - Magma 2 - Atterrissage Grondant",
   "m_availability": 3,
   "m_i18nNameId": 88557,
   "m_i18nDescriptionId": 79862,
-  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
+  "assetGuid": "1493478f0ac258d4997720176d928817"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/710.json b/data/json/SkillDefinition/710.json
index a1ad43df617e90f60b8ff80a0e1f5f57bba46f78..0bb3ddd710080a0c2d909c4662eba92ffe19c3a5 100644
--- a/data/json/SkillDefinition/710.json
+++ b/data/json/SkillDefinition/710.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 710,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/711.json b/data/json/SkillDefinition/711.json
index dc2e6fd6741fc6ee8d0b231a75f63a01c4c66337..52de77ddb0fed6754c251c072140299a85ff21dd 100644
--- a/data/json/SkillDefinition/711.json
+++ b/data/json/SkillDefinition/711.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 711,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/716.json b/data/json/SkillDefinition/716.json
index cf9b2e2c9db3e98449e20cfd8068b7d9e4806b5c..7b6a6d911316c4f5fd810f79b44cec300e980cc6 100644
--- a/data/json/SkillDefinition/716.json
+++ b/data/json/SkillDefinition/716.json
@@ -5,21 +5,24 @@
     "type": "SkillDefinition",
     "id": 716,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 23.33
+          "factor": 1.0
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 3
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "SHIELD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Earth 4 - Repli de la Montagne",
diff --git a/data/json/SkillDefinition/717.json b/data/json/SkillDefinition/717.json
index 7a8b9edbe1d99302c2d247c982adf835e3123eb2..0e80ce2739128ed5a2a0681d29d44cca053be961 100644
--- a/data/json/SkillDefinition/717.json
+++ b/data/json/SkillDefinition/717.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 717,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/719.json b/data/json/SkillDefinition/719.json
index f75c61fa0d64ff219ef50b42bc72f3af832a5c83..9cddbfa1036a435bfcf5a6567bd17a4a83dc57db 100644
--- a/data/json/SkillDefinition/719.json
+++ b/data/json/SkillDefinition/719.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 719,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/72.json b/data/json/SkillDefinition/72.json
index 5625bc4953bf1f24429992b06a4693a5011c3a3d..ab3303aebfb0fffacb1bdbfdf4ddd275fc49a541 100644
--- a/data/json/SkillDefinition/72.json
+++ b/data/json/SkillDefinition/72.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 72,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/720.json b/data/json/SkillDefinition/720.json
index e9471f95f13db1172d9e9c26e778b83c861959db..807de529da36649a384b2b12ed7147830bad3c7b 100644
--- a/data/json/SkillDefinition/720.json
+++ b/data/json/SkillDefinition/720.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 720,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 23.33
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 5
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 1
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "pv",
+          "baseValue": 0.0,
+          "factor": 2.8
         }
       ],
       "hasEffects": true,
@@ -29,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 27488,
   "m_i18nDescriptionId": 27698,
-  "assetGuid": "f4628f3d4f70e904f8326c5d15c2310b"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/7214.json b/data/json/SkillDefinition/7214.json
index 3d2fb5fb75171fe4dbe3dafc197ef9f3bffefea0..d18884c011972225a74fbf3f3a3cd0b961a28c27 100644
--- a/data/json/SkillDefinition/7214.json
+++ b/data/json/SkillDefinition/7214.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 7214,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/723.json b/data/json/SkillDefinition/723.json
index 5be54993871c1fcec1c0a3fe730b960596320517..888e63fab03b5656915da05f57984dd7e4341f27 100644
--- a/data/json/SkillDefinition/723.json
+++ b/data/json/SkillDefinition/723.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 723,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/724.json b/data/json/SkillDefinition/724.json
index f39c5d07660c067ad811e5fb24894acd4fe7632d..84d1c8f1ace093357cff36518c7ac95cbad1dd3d 100644
--- a/data/json/SkillDefinition/724.json
+++ b/data/json/SkillDefinition/724.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 724,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "at",
+          "baseValue": 2.5,
+          "factor": 2.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Justelame Brutale - Light 1 - Bond Éclair",
   "m_availability": 3,
   "m_i18nNameId": 97350,
   "m_i18nDescriptionId": 54506,
-  "assetGuid": "a52adb3fac6a36c409301e33bf8c5b82"
+  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/725.json b/data/json/SkillDefinition/725.json
index fb6010fa8b5cb59c5af7d51a3e88f62f55e16dc9..841b9e17b274d5f9fbfc8baa6ed55a03ff46c72b 100644
--- a/data/json/SkillDefinition/725.json
+++ b/data/json/SkillDefinition/725.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 725,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 1.0
+          "factor": 1.7
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/726.json b/data/json/SkillDefinition/726.json
index 1ef7b65307c16b7ad2760cb997bb8ff3df055b51..02d30c16c013ba69d3408f9644512b98eb567d6c 100644
--- a/data/json/SkillDefinition/726.json
+++ b/data/json/SkillDefinition/726.json
@@ -5,34 +5,29 @@
     "type": "SkillDefinition",
     "id": 726,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "pv",
+          "baseValue": 1.0,
+          "factor": 1.8
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Régulant Gurpapa - Dark 2 - Cuirasse Sordide",
   "m_availability": 3,
   "m_i18nNameId": 51162,
   "m_i18nDescriptionId": 98131,
-  "assetGuid": "0fdc0080cb977ce4d8f4cd00cc97533e"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/727.json b/data/json/SkillDefinition/727.json
index c6861031d92bded0a6d28c395fc617edbea30537..037398b652a51470ae6372d1761c3ad9afbae9d6 100644
--- a/data/json/SkillDefinition/727.json
+++ b/data/json/SkillDefinition/727.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 727,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/73.json b/data/json/SkillDefinition/73.json
index 1f39a8cca6e6ce210ac8183f5c34a85be000496f..47aa77adeee440673a7247b5038e32584d735383 100644
--- a/data/json/SkillDefinition/73.json
+++ b/data/json/SkillDefinition/73.json
@@ -5,21 +5,15 @@
     "type": "SkillDefinition",
     "id": 73,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
-        },
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "ar",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "referenceId": "dmg",
+          "baseValue": 2.0,
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
@@ -32,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 81065,
   "m_i18nDescriptionId": 30289,
-  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
+  "assetGuid": "1493478f0ac258d4997720176d928817"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/731.json b/data/json/SkillDefinition/731.json
index 21b799ba87fd5da10ea252e002fd87c0dd70e2f9..7f1ff0e1892bf7ff60ae48d546f5ab6143a37b2b 100644
--- a/data/json/SkillDefinition/731.json
+++ b/data/json/SkillDefinition/731.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 731,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/733.json b/data/json/SkillDefinition/733.json
index 001760e594d733644ef2c219aa57c77ca09da0ae..a876d2540a9f56d8e0668780d710542d3d8cd0a2 100644
--- a/data/json/SkillDefinition/733.json
+++ b/data/json/SkillDefinition/733.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 733,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.667
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 3
+          "value": 4
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 6.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/734.json b/data/json/SkillDefinition/734.json
index 4b80adf553d6b56db671e07d081cb0a95fc950d2..b97c9f01a08dfdfd1ff314c785821b8b174fdba0 100644
--- a/data/json/SkillDefinition/734.json
+++ b/data/json/SkillDefinition/734.json
@@ -5,29 +5,26 @@
     "type": "SkillDefinition",
     "id": 734,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "pv",
           "baseValue": 0.0,
-          "factor": 40.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "nb",
-          "value": 1
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Water 6 - Archer des Mers",
   "m_availability": 3,
   "m_i18nNameId": 37794,
   "m_i18nDescriptionId": 50837,
-  "assetGuid": "fa6aeeba614d11b41a79601e374c8e51"
+  "assetGuid": "471c2686222e94a398d960396cf313dc"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/7347.json b/data/json/SkillDefinition/7347.json
index bb16eaa8f75e413a04f84c3c7da8166ae5ea864f..60d6c3d013d48e1f660de0d030e465bec2f338c4 100644
--- a/data/json/SkillDefinition/7347.json
+++ b/data/json/SkillDefinition/7347.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 7347,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/735.json b/data/json/SkillDefinition/735.json
index 62b171d98c3adf69f19446fac13a5e2ae331ae4c..f50c445696d3b7c82f732ba1aeb0c24e0198ace0 100644
--- a/data/json/SkillDefinition/735.json
+++ b/data/json/SkillDefinition/735.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 735,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/736.json b/data/json/SkillDefinition/736.json
index 2346aeb9a208c068ec3f053c5d38c759af7e9631..3c5021bd6811076b63cb68cbe0e07b3400eff7c4 100644
--- a/data/json/SkillDefinition/736.json
+++ b/data/json/SkillDefinition/736.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 736,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/737.json b/data/json/SkillDefinition/737.json
index 761842ed87f4edac8d86f8e20a04442526527b63..3826eebf109cb816dff0d7a85ee8f9760b951945 100644
--- a/data/json/SkillDefinition/737.json
+++ b/data/json/SkillDefinition/737.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 737,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/738.json b/data/json/SkillDefinition/738.json
index 72b64352130d86a9621902ebd9e3ac83575c39d9..f76668b92ec520bc9e76d479860ead4001e5bbb0 100644
--- a/data/json/SkillDefinition/738.json
+++ b/data/json/SkillDefinition/738.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 738,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 6
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 3.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/739.json b/data/json/SkillDefinition/739.json
index 83076fbc0806886ebd2e586541f370b1a6d2fed6..1e381842aca2b90511bd684d4bb059e6a334f0e8 100644
--- a/data/json/SkillDefinition/739.json
+++ b/data/json/SkillDefinition/739.json
@@ -17,7 +17,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/740.json b/data/json/SkillDefinition/740.json
index 7b929a9802835235344c33d07c2d3a0123edbb33..a7c9903917235da290ef40a1235168c9a39d2cb0 100644
--- a/data/json/SkillDefinition/740.json
+++ b/data/json/SkillDefinition/740.json
@@ -5,26 +5,19 @@
     "type": "SkillDefinition",
     "id": 740,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmgP",
           "baseValue": 0.0,
-          "factor": 26.67
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "aura",
-          "value": 2
+          "factor": 5.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "FIRESWORD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Fire 6 - Bretteur du Desert",
diff --git a/data/json/SkillDefinition/742.json b/data/json/SkillDefinition/742.json
index 6bfe92fe3160a29b2723de7707ab4887e3d0453c..88fd7649097eb1e0cbba60d631f8971f129136dc 100644
--- a/data/json/SkillDefinition/742.json
+++ b/data/json/SkillDefinition/742.json
@@ -5,21 +5,15 @@
     "type": "SkillDefinition",
     "id": 742,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.667
-        },
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc2",
-          "baseValue": 0.0,
-          "factor": 1.667
+          "referenceId": "ar",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -30,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 74815,
   "m_i18nDescriptionId": 62711,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/743.json b/data/json/SkillDefinition/743.json
index bc0cd75803284e5ccaa9b4e12f19d892808c7af3..3f740642050d55c70069c4254611ab69171ae81e 100644
--- a/data/json/SkillDefinition/743.json
+++ b/data/json/SkillDefinition/743.json
@@ -5,20 +5,28 @@
     "type": "SkillDefinition",
     "id": 743,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "LIGHTNING"
+        "MECHANISM",
+        {
+          "type": 7,
+          "id": 439
+        },
+        {
+          "type": 25,
+          "id": 73558
+        }
       ]
     }
   },
@@ -26,5 +34,5 @@
   "m_availability": 3,
   "m_i18nNameId": 97780,
   "m_i18nDescriptionId": 88160,
-  "assetGuid": "a52adb3fac6a36c409301e33bf8c5b82"
+  "assetGuid": "0803ccf5b4397bc4dbb49fbb81da7f60"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/744.json b/data/json/SkillDefinition/744.json
index 60cf8e9ad8c8523814dc1009f5376aefd7e80096..3298054770550f7b818ea1f26fb87f8dfc504813 100644
--- a/data/json/SkillDefinition/744.json
+++ b/data/json/SkillDefinition/744.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 744,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/747.json b/data/json/SkillDefinition/747.json
index cd2375e7429df8c7b153f238c542831d24f00cfb..756ed2ee14c6543df5cb71050201278b76d73ce0 100644
--- a/data/json/SkillDefinition/747.json
+++ b/data/json/SkillDefinition/747.json
@@ -5,34 +5,24 @@
     "type": "SkillDefinition",
     "id": 747,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 5
+          "value": -5
         },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "pv",
+          "baseValue": 3.0,
+          "factor": 2.2
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Synchronisateur Tako - Dark 2 - Accumulation Sournoise",
diff --git a/data/json/SkillDefinition/7478.json b/data/json/SkillDefinition/7478.json
index aa70f3b8c65fe7035d167a13d0ff490d8a8a9b33..2d9dbf297645292998ecd7111997e12a32d0257b 100644
--- a/data/json/SkillDefinition/7478.json
+++ b/data/json/SkillDefinition/7478.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 7478,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/75.json b/data/json/SkillDefinition/75.json
index 5eee3cac2e232b9c05dc5ec3b28e63a37520ca9b..bbc41ae375268a8030b89bd9a1dad44364e3f2d3 100644
--- a/data/json/SkillDefinition/75.json
+++ b/data/json/SkillDefinition/75.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 75,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/751.json b/data/json/SkillDefinition/751.json
index 8a1bc8693ec4c27efacbcd3d4e77b89ee5e7592a..84930eca87950cc6a12daee2a1e2364349b18129 100644
--- a/data/json/SkillDefinition/751.json
+++ b/data/json/SkillDefinition/751.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 751,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/755.json b/data/json/SkillDefinition/755.json
index 7ad08855d9dc93961a355bcacbf05c3a6d850383..dad47ffb5887d8798c4f99746b375f3acec1142a 100644
--- a/data/json/SkillDefinition/755.json
+++ b/data/json/SkillDefinition/755.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 755,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "dmg",
+          "baseValue": 2.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/756.json b/data/json/SkillDefinition/756.json
index 5c2980083c5e4343b5b391856a19d96d6fef058f..b715304142dfa86e84adeb62db4ef0cbe8724701 100644
--- a/data/json/SkillDefinition/756.json
+++ b/data/json/SkillDefinition/756.json
@@ -5,21 +5,21 @@
     "type": "SkillDefinition",
     "id": 756,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.1
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "SHIELD",
-        "SHADOW"
+        "SHADOW",
+        "SHIELD"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/758.json b/data/json/SkillDefinition/758.json
index ce9c31a570d65f59a370b9692f18267944b81488..c6aec326ccf20f36fd5d98dc406ab18cc0d6bdd6 100644
--- a/data/json/SkillDefinition/758.json
+++ b/data/json/SkillDefinition/758.json
@@ -5,25 +5,19 @@
     "type": "SkillDefinition",
     "id": 758,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
+          "referenceId": "boost",
+          "baseValue": 10.0,
+          "factor": 6.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "WAVE",
         "SHIELD"
       ]
     }
diff --git a/data/json/SkillDefinition/76.json b/data/json/SkillDefinition/76.json
index 3869c1ca7c0dd2bbb620befb3f6775a6c6ca8d9c..09b8291b792b8f84a6d4d12cdfcec85b997ae3b5 100644
--- a/data/json/SkillDefinition/76.json
+++ b/data/json/SkillDefinition/76.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 76,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 3
+          "value": 4
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 4.0,
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/764.json b/data/json/SkillDefinition/764.json
index 6330bc0f346a6ca29c00b29e4c8eccc9e1350914..b7713ff0e05aa477cf2cd15d4ee17a3d4bd1b9bc 100644
--- a/data/json/SkillDefinition/764.json
+++ b/data/json/SkillDefinition/764.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 764,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/765.json b/data/json/SkillDefinition/765.json
index 96cdd6480c57b054fd04aab3a31fb7dc139d44ab..0c729e552c142938c67fd5f4500b61e10a5d87e7 100644
--- a/data/json/SkillDefinition/765.json
+++ b/data/json/SkillDefinition/765.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 765,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/767.json b/data/json/SkillDefinition/767.json
index f9b346122f450c00d825685dd6ef500ca3f8c00a..5dfdc9b6806ead009b4c1d1575de72d85c5fc19b 100644
--- a/data/json/SkillDefinition/767.json
+++ b/data/json/SkillDefinition/767.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 767,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/768.json b/data/json/SkillDefinition/768.json
index 03340bbc243caf154ebba1be5372d1f31a656a5a..6386c982a8eef0d887b6cb731a7aa798b613a1b4 100644
--- a/data/json/SkillDefinition/768.json
+++ b/data/json/SkillDefinition/768.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 768,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.33
+          "referenceId": "ar",
+          "baseValue": 4.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/77.json b/data/json/SkillDefinition/77.json
index 83abc709ee18ca847443ebf20c75f10c1e774dac..5a630c01454ad7dbb7797decff2ce063c8a665c8 100644
--- a/data/json/SkillDefinition/77.json
+++ b/data/json/SkillDefinition/77.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 77,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "pv",
           "baseValue": 0.0,
-          "factor": 66.67
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/771.json b/data/json/SkillDefinition/771.json
index 9d49dc678cfabb6d8381a548926e2c17182ce827..f2ec99897218e197e0b88e7acd9766b8a1c91055 100644
--- a/data/json/SkillDefinition/771.json
+++ b/data/json/SkillDefinition/771.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 771,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/772.json b/data/json/SkillDefinition/772.json
index 257b342319634e87c25b7a0824a71c1ddc97058c..d8b523888002364b6981ed7e85071dc729599c96 100644
--- a/data/json/SkillDefinition/772.json
+++ b/data/json/SkillDefinition/772.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 772,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/773.json b/data/json/SkillDefinition/773.json
index b7c807fce6290e7dc2c2146ece5f7ec52736becc..aa96d528ba560b5490ba1d59a5efb7f3074e48b8 100644
--- a/data/json/SkillDefinition/773.json
+++ b/data/json/SkillDefinition/773.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 773,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/775.json b/data/json/SkillDefinition/775.json
index 94d0d8a5fa15f9fb59a1942ed41238b333e592ba..4c650d0f1c6c5763524bbd73e80d9745465b0d9f 100644
--- a/data/json/SkillDefinition/775.json
+++ b/data/json/SkillDefinition/775.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 775,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/782.json b/data/json/SkillDefinition/782.json
index 7e9fed4f745f3b402e048c366d63af791a6add61..d719210cc16c5a6704e6dc15609b9c240469102c 100644
--- a/data/json/SkillDefinition/782.json
+++ b/data/json/SkillDefinition/782.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 782,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 40.0,
-          "factor": 2.0
+          "baseValue": 10.0,
+          "factor": 3.0
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "perc2",
-          "value": 15
+          "referenceId": "dmg",
+          "value": 10
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/785.json b/data/json/SkillDefinition/785.json
index 2b14ad6ccdd01a4fcfbdffa300a5150bfd8c4a04..a66ee847acf269dbd59a03c61cd2629f8f1a525b 100644
--- a/data/json/SkillDefinition/785.json
+++ b/data/json/SkillDefinition/785.json
@@ -5,25 +5,27 @@
     "type": "SkillDefinition",
     "id": 785,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 40.0,
-          "factor": 2.0
+          "referenceId": "boost",
+          "baseValue": 10.0,
+          "factor": 3.0
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "perc2",
-          "value": 40
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 15.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
         "LIGHTNING",
+        "DEATHBLOW",
         "CHAMPIONAURA",
         {
           "type": 25,
diff --git a/data/json/SkillDefinition/786.json b/data/json/SkillDefinition/786.json
index 03a3fce12a4f419deb4f3ee77cbc34883c77f5bf..0cfa04c2c9d8933bb8e3452ff4c49a9561bae341 100644
--- a/data/json/SkillDefinition/786.json
+++ b/data/json/SkillDefinition/786.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 786,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 6
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 4.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/788.json b/data/json/SkillDefinition/788.json
index 887fbbad1b063c8a2dbcbc3e678fbcaca693ffca..deac41aaba8cf7b565a04e5c4a6d741e08de670d 100644
--- a/data/json/SkillDefinition/788.json
+++ b/data/json/SkillDefinition/788.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 788,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/789.json b/data/json/SkillDefinition/789.json
index f1a596ba79434913fbc8ed930d31e4b5571bcd06..8dcbefaa8c7f9775deb9826db9049f0553d2cb44 100644
--- a/data/json/SkillDefinition/789.json
+++ b/data/json/SkillDefinition/789.json
@@ -5,24 +5,22 @@
     "type": "SkillDefinition",
     "id": 789,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 46.66
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "nb",
-          "value": 2
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "EXPLOSION",
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Fire 2 - Affûtage Brûlant",
diff --git a/data/json/SkillDefinition/79.json b/data/json/SkillDefinition/79.json
index ae9ed5d7b8b4c1cc1fa5e6ac456cbe1254a46cf3..8141817175aff32ca4b4286617137f81bff5355c 100644
--- a/data/json/SkillDefinition/79.json
+++ b/data/json/SkillDefinition/79.json
@@ -5,29 +5,26 @@
     "type": "SkillDefinition",
     "id": 79,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 40.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "nb",
-          "value": 1
+          "referenceId": "dmg",
+          "baseValue": 3.0,
+          "factor": 1.7
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Earth 6 - Archer des Landes",
   "m_availability": 3,
   "m_i18nNameId": 85403,
   "m_i18nDescriptionId": 40606,
-  "assetGuid": "fa6aeeba614d11b41a79601e374c8e51"
+  "assetGuid": "db8a7fef5dfd745f69f7daa7c81fe3ee"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/790.json b/data/json/SkillDefinition/790.json
index 7996722a70b690fec8d047099f06be3eb92fb300..45a3dbdd5e7a218a527d0cb91616e5b161fd1866 100644
--- a/data/json/SkillDefinition/790.json
+++ b/data/json/SkillDefinition/790.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 790,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/791.json b/data/json/SkillDefinition/791.json
index e7846e39e92d41c57ff6762c336b2f59d988a58c..d92eccbdc32417c59e71daad7ac9296b8bd2f597 100644
--- a/data/json/SkillDefinition/791.json
+++ b/data/json/SkillDefinition/791.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 791,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/7914.json b/data/json/SkillDefinition/7914.json
index 93e3bb76a3bbefc9150a3abc98c447e8eb9ed44b..0f120acd2a9bb09c7a94d566c16c1167c4657891 100644
--- a/data/json/SkillDefinition/7914.json
+++ b/data/json/SkillDefinition/7914.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 7914,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/793.json b/data/json/SkillDefinition/793.json
index cf53fd872547d3c5b2570c00de95216e6fe598b3..4d3d7d9fe39e6240b224f8deb8d4eaf5fd0a921f 100644
--- a/data/json/SkillDefinition/793.json
+++ b/data/json/SkillDefinition/793.json
@@ -8,7 +8,10 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "ActionValueModifier"
+          "type": "BuffModifier",
+          "caracIds": [
+            58
+          ]
         },
         "value": {
           "type": "ConstIntegerValue",
@@ -17,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/794.json b/data/json/SkillDefinition/794.json
index 50f75bc2d0a27741bdd752715129968dd3e173f7..c221f32cad2728dbc2018d3a0e7deafc05bda6ce 100644
--- a/data/json/SkillDefinition/794.json
+++ b/data/json/SkillDefinition/794.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 794,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 50.0
+          "referenceId": "buffM",
+          "baseValue": 5.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/795.json b/data/json/SkillDefinition/795.json
index b0486dd9cfc8e83dbdcf9242e95e5e6168517c55..4eded1f98a951e8df4139b937b6e84bc2b75affb 100644
--- a/data/json/SkillDefinition/795.json
+++ b/data/json/SkillDefinition/795.json
@@ -5,29 +5,29 @@
     "type": "SkillDefinition",
     "id": 795,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 22.0
+          "referenceId": "dmg",
+          "baseValue": 11.0,
+          "factor": 1.0
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 2
+          "referenceId": "c",
+          "value": 3
         }
       ],
       "hasEffects": true,
       "keywordReferences": []
     }
   },
-  "m_displayName": "COMMON - Fire 5 - Posture du Feu",
+  "m_displayName": "IOP - Fire 5 - Posture du Feu",
   "m_availability": 3,
   "m_i18nNameId": 19561,
   "m_i18nDescriptionId": 75621,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "97c1625e918cd4582aa6c800ceb1e7d1"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/796.json b/data/json/SkillDefinition/796.json
index a98f1fbea8e2062b3ae8914422f9ef5cc8b5d1d1..2fb474d93de1c50f704065a0dc0c4b7f7efdfca2 100644
--- a/data/json/SkillDefinition/796.json
+++ b/data/json/SkillDefinition/796.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 796,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/797.json b/data/json/SkillDefinition/797.json
index 5ef8818b21f60e4adb08555d60f38c3b7de66e92..30314c380dac520220ed77f9540838064459c076 100644
--- a/data/json/SkillDefinition/797.json
+++ b/data/json/SkillDefinition/797.json
@@ -5,20 +5,21 @@
     "type": "SkillDefinition",
     "id": 797,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.67
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "WAVE"
+        "WAVE",
+        "SIGHT"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/798.json b/data/json/SkillDefinition/798.json
index 7ad152e012fdfde6a6ce28e6ef1de3b2cb456362..4277bf402e542ca07eb19fe3798cc76a396cbb45 100644
--- a/data/json/SkillDefinition/798.json
+++ b/data/json/SkillDefinition/798.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 798,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/799.json b/data/json/SkillDefinition/799.json
index ac7c2b50f38fe165db5b8501abaad4819640a0b2..6707ba78f59d8cd1b8c7349dd0310a95bd8e732c 100644
--- a/data/json/SkillDefinition/799.json
+++ b/data/json/SkillDefinition/799.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 799,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/80.json b/data/json/SkillDefinition/80.json
index 952e50e924b3a741b4179b326ac6d8a81b7c2b23..21e992253cc7e28972ec35007abaf335e7e42ce3 100644
--- a/data/json/SkillDefinition/80.json
+++ b/data/json/SkillDefinition/80.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 80,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 20.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 5
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 84700,
   "m_i18nDescriptionId": 69343,
-  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
+  "assetGuid": "fa6aeeba614d11b41a79601e374c8e51"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/800.json b/data/json/SkillDefinition/800.json
index 125bb9a63cc5ff859e6936a5c696030e3cd3c4a8..af1ba6cfde5ad49f1834540f865a69557175d144 100644
--- a/data/json/SkillDefinition/800.json
+++ b/data/json/SkillDefinition/800.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 800,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/801.json b/data/json/SkillDefinition/801.json
index 4593f87d5d63b76fd9b9343f202c69afc430cbb2..685b7ae73b1ff73c28db2276302fb013ffa41dd2 100644
--- a/data/json/SkillDefinition/801.json
+++ b/data/json/SkillDefinition/801.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 801,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/802.json b/data/json/SkillDefinition/802.json
index f35ee28fc3bc67a68fd2dee17cce9af67853dc6f..eae6f4172e9e543f0fd51d2f32ee2777cb751e53 100644
--- a/data/json/SkillDefinition/802.json
+++ b/data/json/SkillDefinition/802.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 802,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/804.json b/data/json/SkillDefinition/804.json
index 8884620234e7b5d7fe8b8bd9d9a48152d00283dc..449cd4c4fcb091359c721d5f34868cae45475fa0 100644
--- a/data/json/SkillDefinition/804.json
+++ b/data/json/SkillDefinition/804.json
@@ -5,20 +5,21 @@
     "type": "SkillDefinition",
     "id": 804,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 4.667
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "WAVE"
+        "WAVE",
+        "PHASE"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/805.json b/data/json/SkillDefinition/805.json
index 86316b7e922b9266f89d74d3d203cbb8e8e24b37..6fa598735381015834532362df693b1f3fbef8ae 100644
--- a/data/json/SkillDefinition/805.json
+++ b/data/json/SkillDefinition/805.json
@@ -5,31 +5,24 @@
     "type": "SkillDefinition",
     "id": 805,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "dmg",
+          "baseValue": 5.0,
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Bouvaloir Orok - Empty 1 - Traînée Instable",
   "m_availability": 3,
   "m_i18nNameId": 8663,
   "m_i18nDescriptionId": 12177,
-  "assetGuid": "9085b25ad140f5f4c869893f5f173030"
+  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/8055.json b/data/json/SkillDefinition/8055.json
index e7a2f8e68a74107002e489cf4e8e94a8c4dd571e..b0de0147620d636ae8b8754b2dac142256016791 100644
--- a/data/json/SkillDefinition/8055.json
+++ b/data/json/SkillDefinition/8055.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8055,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/806.json b/data/json/SkillDefinition/806.json
index a7b7438e0ff3bbef889804323b0238f82ae9f1c1..1e8e6ce854686e79e1b025a8cda9efaa3178dafa 100644
--- a/data/json/SkillDefinition/806.json
+++ b/data/json/SkillDefinition/806.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             75
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/807.json b/data/json/SkillDefinition/807.json
index d1cb75788d71da86acc722af2792d5950fa13b29..a247e7e02b7e87061fe787b6fcda57924ff299c0 100644
--- a/data/json/SkillDefinition/807.json
+++ b/data/json/SkillDefinition/807.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 807,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/808.json b/data/json/SkillDefinition/808.json
index 1016d2edeb370b3510804343daaf5d4f8756b12f..a7f33c2920897a0a39ab3d46ef054b72184bed03 100644
--- a/data/json/SkillDefinition/808.json
+++ b/data/json/SkillDefinition/808.json
@@ -5,26 +5,29 @@
     "type": "SkillDefinition",
     "id": 808,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "at",
           "baseValue": 0.0,
-          "factor": 2.0
+          "factor": 7.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Régulant Gurpapa - Light 2 - Cuirasse Étincelante",
   "m_availability": 3,
   "m_i18nNameId": 79160,
   "m_i18nDescriptionId": 66375,
-  "assetGuid": "0fdc0080cb977ce4d8f4cd00cc97533e"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/81.json b/data/json/SkillDefinition/81.json
index 4b9e646b97ecc6869f5f21859b07c9b515f80e26..3f05eb03d0c31cd75747f400aefc7ddd3851f561 100644
--- a/data/json/SkillDefinition/81.json
+++ b/data/json/SkillDefinition/81.json
@@ -5,29 +5,26 @@
     "type": "SkillDefinition",
     "id": 81,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 22.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 2
+          "referenceId": "dmg",
+          "baseValue": 7.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "BOUNCE"
+      ]
     }
   },
-  "m_displayName": "COMMON - Air 5 - Posture de l\u0027Air",
+  "m_displayName": "IOP - Air 5 - Posture de l\u0027Air",
   "m_availability": 3,
   "m_i18nNameId": 11706,
   "m_i18nDescriptionId": 79069,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "0125556b33fbb453f83eb6e15209391b"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/8105.json b/data/json/SkillDefinition/8105.json
index d200dcd44b554d70ad362c13dbd3924c790347d2..24ab579f354e43a192ad624b489d1d4934964e06 100644
--- a/data/json/SkillDefinition/8105.json
+++ b/data/json/SkillDefinition/8105.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8105,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/812.json b/data/json/SkillDefinition/812.json
index 578eb89fdb9ab4ee4cc08f8ec3b7967af23e42ad..611aee6a00b77ef9ebebbef7f7f70f1c71736aea 100644
--- a/data/json/SkillDefinition/812.json
+++ b/data/json/SkillDefinition/812.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 812,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/813.json b/data/json/SkillDefinition/813.json
index b829c74e7d29e576a3314ed7404283e18f11ca78..8a81cfa710c956e285afcdc60f597462d9d01a9f 100644
--- a/data/json/SkillDefinition/813.json
+++ b/data/json/SkillDefinition/813.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 813,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/816.json b/data/json/SkillDefinition/816.json
index 8d1e4605db03ff2a6667ccf097b1a7d750186af0..98985c8c3917c62531cab8a76654bed6db4d6bec 100644
--- a/data/json/SkillDefinition/816.json
+++ b/data/json/SkillDefinition/816.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             76
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 200
+          "value": 2000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 200
+          "value": 2000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/817.json b/data/json/SkillDefinition/817.json
index 985ffa890eaf0b32d33b66b8e2acf72fc8038e70..035bb0859743fbf907b6a28fb8b5439e8a4f9b24 100644
--- a/data/json/SkillDefinition/817.json
+++ b/data/json/SkillDefinition/817.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 817,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/818.json b/data/json/SkillDefinition/818.json
index 7fccbeefbeb07c1539485cfaa183a63b2b8173af..9159293216dfd6abd19513d41f9fa9283f02bba2 100644
--- a/data/json/SkillDefinition/818.json
+++ b/data/json/SkillDefinition/818.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 818,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/8180.json b/data/json/SkillDefinition/8180.json
index 5e500c57a8bf077404a55b216f871655ddb5daf8..a2360caf32b86115d2111d683ac453328ff4977c 100644
--- a/data/json/SkillDefinition/8180.json
+++ b/data/json/SkillDefinition/8180.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8180,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/819.json b/data/json/SkillDefinition/819.json
index 1ca6c9b225d73c22d4de9acc2b55342e136ba09d..e29ea016b167a65302fa1e386c472771baf3d35b 100644
--- a/data/json/SkillDefinition/819.json
+++ b/data/json/SkillDefinition/819.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 819,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/82.json b/data/json/SkillDefinition/82.json
index a4031b29ed28968223460ccb9e53c59d93493fb7..bd6b4f9ec5aacadd39da04d4578d9240aadacf06 100644
--- a/data/json/SkillDefinition/82.json
+++ b/data/json/SkillDefinition/82.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 82,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/820.json b/data/json/SkillDefinition/820.json
index c45896855ebd230aae4e88558c894c59b6eb5c9b..14c7ab28d3394a31d14d243453a18a65b0cdbe07 100644
--- a/data/json/SkillDefinition/820.json
+++ b/data/json/SkillDefinition/820.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 820,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 3
+          "value": 4
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/821.json b/data/json/SkillDefinition/821.json
index c8357a3f216ef4095c20fa8cbf704d9e8f137776..c3b7e70a2f92f80fef91bf3ee2d5642c47a971a3 100644
--- a/data/json/SkillDefinition/821.json
+++ b/data/json/SkillDefinition/821.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 821,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/822.json b/data/json/SkillDefinition/822.json
index 651604b7011efff381962c8e9636fda1c02ef3bf..1e895173bca44969a64ed3e3d116979c6eaaacd3 100644
--- a/data/json/SkillDefinition/822.json
+++ b/data/json/SkillDefinition/822.json
@@ -5,31 +5,24 @@
     "type": "SkillDefinition",
     "id": 822,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.2
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "pv",
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Bouvaloir Orok - Dark 1 - Traînée Sombre",
   "m_availability": 3,
   "m_i18nNameId": 88611,
   "m_i18nDescriptionId": 99898,
-  "assetGuid": "1924e787deef5d14fa075790688d48bb"
+  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/824.json b/data/json/SkillDefinition/824.json
index dd50a4372fdc250b4f7ff503332f5e6c98b57f9e..f1587a5bf36e20c9a42b0960614de904b03e6d08 100644
--- a/data/json/SkillDefinition/824.json
+++ b/data/json/SkillDefinition/824.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/825.json b/data/json/SkillDefinition/825.json
index 6e1426c8f97187bb01b68bb920439c494de6b882..0ced2619adbad8da5cce78e7ec171728196b383d 100644
--- a/data/json/SkillDefinition/825.json
+++ b/data/json/SkillDefinition/825.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 825,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/826.json b/data/json/SkillDefinition/826.json
index 5d6c889e165d61a7b70355225588edc448e6905f..1426dab055b226e2a84304d4e7ed6add3f31612b 100644
--- a/data/json/SkillDefinition/826.json
+++ b/data/json/SkillDefinition/826.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 826,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 16.67
+          "referenceId": "at",
+          "baseValue": 1.0,
+          "factor": 1.7
         }
       ],
       "hasEffects": true,
@@ -24,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 89802,
   "m_i18nDescriptionId": 53543,
-  "assetGuid": "b02700d58ccdcf1498f924e7bfa71f04"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/827.json b/data/json/SkillDefinition/827.json
index 8e495505044e2c5c22af97d49a095a7a654f0f04..ffd07f848eca3be6e3f46522b8e7b53a643afa89 100644
--- a/data/json/SkillDefinition/827.json
+++ b/data/json/SkillDefinition/827.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 827,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/828.json b/data/json/SkillDefinition/828.json
index 614ac0560d46e81519666bc2e4df9b13dc0f5b1e..5ecd03e850e25813a94ce26a36abb1380aa3f49a 100644
--- a/data/json/SkillDefinition/828.json
+++ b/data/json/SkillDefinition/828.json
@@ -5,15 +5,15 @@
     "type": "SkillDefinition",
     "id": 828,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 4.0
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/829.json b/data/json/SkillDefinition/829.json
index d088e2333ed1345bb6e3fb8e47c7dac08fccd4a1..998bf9c3b4bdb0237a7effaa52cf7be7d5268d9a 100644
--- a/data/json/SkillDefinition/829.json
+++ b/data/json/SkillDefinition/829.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 829,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/83.json b/data/json/SkillDefinition/83.json
index e59342a51dda82c1d7505d0ad459b8f8b7837ce9..ee6f535a5ee1e0f88fc0c4ab90a5f8e751a494ee 100644
--- a/data/json/SkillDefinition/83.json
+++ b/data/json/SkillDefinition/83.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 83,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/830.json b/data/json/SkillDefinition/830.json
index 88914c14045bfe70e85edc548eba7831a4f198b7..0b4d431d6943d4cf1837ebb4829eed2e1e6a858e 100644
--- a/data/json/SkillDefinition/830.json
+++ b/data/json/SkillDefinition/830.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 830,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/831.json b/data/json/SkillDefinition/831.json
index c8390fede2f2b2c013e9ca4785ebd20382f9fb87..db215db481d8f312d579fa63e7749a2a5434fe45 100644
--- a/data/json/SkillDefinition/831.json
+++ b/data/json/SkillDefinition/831.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 350
+          "value": 7000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 350
+          "value": 7000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/832.json b/data/json/SkillDefinition/832.json
index f3a35ed049f40f89f18ab6d4ce3e36dcfad48f58..a619db21f6049ed37008693f65959fc2abc1e3f5 100644
--- a/data/json/SkillDefinition/832.json
+++ b/data/json/SkillDefinition/832.json
@@ -5,26 +5,24 @@
     "type": "SkillDefinition",
     "id": 832,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmgP",
           "baseValue": 0.0,
-          "factor": 33.33
+          "factor": 3.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "MELEE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Air 3 - Bagarreur Reflechi",
   "m_availability": 3,
   "m_i18nNameId": 61161,
   "m_i18nDescriptionId": 47113,
-  "assetGuid": "d6f4b19ec899c0947b9176ec7dce90cb"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/833.json b/data/json/SkillDefinition/833.json
index 93add5e1c5b2cc156b0f946e8aa6d08d3d51bbdb..28d78fce224430233616dc07ee47cef4c16eb8cc 100644
--- a/data/json/SkillDefinition/833.json
+++ b/data/json/SkillDefinition/833.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 833,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/834.json b/data/json/SkillDefinition/834.json
index 296d3ffbff1112440a153ec825224d649b2a214d..08ffa28c2dd4fb33930516e575dce25dad6afa9e 100644
--- a/data/json/SkillDefinition/834.json
+++ b/data/json/SkillDefinition/834.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 834,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 3
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 5.0
+          "referenceId": "dmg",
+          "baseValue": 2.0,
+          "factor": 1.8
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/836.json b/data/json/SkillDefinition/836.json
index 12c17cd1f71e142adceeca0e5636a547f716d4b8..f3e1cd1ee15b91bcab6db9a30407ba5a0a168bb3 100644
--- a/data/json/SkillDefinition/836.json
+++ b/data/json/SkillDefinition/836.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 836,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/838.json b/data/json/SkillDefinition/838.json
index 5501e851024aeea07b80445e4f2de01fd075e0c3..a01594daf0aa86835bb53105c1c26eefc6f9e611 100644
--- a/data/json/SkillDefinition/838.json
+++ b/data/json/SkillDefinition/838.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 838,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/839.json b/data/json/SkillDefinition/839.json
index 39a0a28a3a56a67fe3b289ab0a844c8478ab8949..a0b1986e647e90f8d8eda32bda52dbd2742263ef 100644
--- a/data/json/SkillDefinition/839.json
+++ b/data/json/SkillDefinition/839.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 839,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/84.json b/data/json/SkillDefinition/84.json
index 0052a1a29d61d4a0b80969933877f99b9b5e2127..2b3b1aa1cf7efd60b109cf08ffbbca78b54e8fce 100644
--- a/data/json/SkillDefinition/84.json
+++ b/data/json/SkillDefinition/84.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 84,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/841.json b/data/json/SkillDefinition/841.json
index 46d02b5733df7794bd19db04aafdd59adae32d0c..e819278713e052ac9c8271716107a79e843af532 100644
--- a/data/json/SkillDefinition/841.json
+++ b/data/json/SkillDefinition/841.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             75
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 200
+          "value": 2000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 200
+          "value": 2000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/844.json b/data/json/SkillDefinition/844.json
index cbdfc1593a7e34d922e8c478baf98837bef4a9bc..266e0707dd1d6a309ce131aab3a2c32921a35ee8 100644
--- a/data/json/SkillDefinition/844.json
+++ b/data/json/SkillDefinition/844.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 100
+          "value": 2000
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 50
+          "value": 1000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 100
+          "value": 2000
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 50
+          "value": 1000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/848.json b/data/json/SkillDefinition/848.json
index 99572c6627b5fcf5fb6e53716e7f5f7c7ab6a0b7..7d32922e47e14d4529de7f7a188e71d13f0bf118 100644
--- a/data/json/SkillDefinition/848.json
+++ b/data/json/SkillDefinition/848.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             76
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 50
+          "value": 500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/849.json b/data/json/SkillDefinition/849.json
index af55166f73b950a5b883d1d552809f282aaa4128..b49e04e9ec8a4b89395558f770c17781aa6a3a61 100644
--- a/data/json/SkillDefinition/849.json
+++ b/data/json/SkillDefinition/849.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 849,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/85.json b/data/json/SkillDefinition/85.json
index 956965a68153c03150d42f790b4b7405777851fd..d1847d4a62f8df7bab2be19ad3f3001b5de93726 100644
--- a/data/json/SkillDefinition/85.json
+++ b/data/json/SkillDefinition/85.json
@@ -5,26 +5,19 @@
     "type": "SkillDefinition",
     "id": 85,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 5.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "at",
+          "baseValue": 2.0,
+          "factor": 4.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "LIGHTNING"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Catalysateur Pramium - Light 2 - Rouage Éblouissant",
diff --git a/data/json/SkillDefinition/851.json b/data/json/SkillDefinition/851.json
index cec028ed5413a8af059dbf1f7ff8a6e3779cacf2..45d6e8473759adf4fb1fbb9cfa65a227253b33b3 100644
--- a/data/json/SkillDefinition/851.json
+++ b/data/json/SkillDefinition/851.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 851,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/8547.json b/data/json/SkillDefinition/8547.json
index 07e57fff24c8689d6b634e77898304c394796851..c9ee0f2be144d8ebca52ae77156bb28283694e5f 100644
--- a/data/json/SkillDefinition/8547.json
+++ b/data/json/SkillDefinition/8547.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8547,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/855.json b/data/json/SkillDefinition/855.json
index 1a9278bf7a7f09a974765b5c0518120a854e807e..2d1ab2b5f5ab1648c5c396ba4d8341ef302d0ec3 100644
--- a/data/json/SkillDefinition/855.json
+++ b/data/json/SkillDefinition/855.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 855,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/856.json b/data/json/SkillDefinition/856.json
index a5e84b6b9a570e1debbd757b95a5b4c52cf7bcfe..fd66b8d3b6d4a77c64ee4ab1fbcdbf31742043b0 100644
--- a/data/json/SkillDefinition/856.json
+++ b/data/json/SkillDefinition/856.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 856,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/857.json b/data/json/SkillDefinition/857.json
index a4559d11c4a622c108925fc9c2a97cd96c13779b..11bb860fb3e71ddbed7600e89971d9f7ea68850b 100644
--- a/data/json/SkillDefinition/857.json
+++ b/data/json/SkillDefinition/857.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 857,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/8579.json b/data/json/SkillDefinition/8579.json
index 183d09e342aed268d2a31c5b1bc9fa7f7e06a9d1..04e0743748fc3ff4c59a7e2ee0690b5bf5ca16d9 100644
--- a/data/json/SkillDefinition/8579.json
+++ b/data/json/SkillDefinition/8579.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8579,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/859.json b/data/json/SkillDefinition/859.json
index 6567208ae378ad639db15ab5b75e3e816ee03c2c..f2248b598e31fc6cb3c43886364bddd5686ff1b9 100644
--- a/data/json/SkillDefinition/859.json
+++ b/data/json/SkillDefinition/859.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 859,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 4.33
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/86.json b/data/json/SkillDefinition/86.json
index 019f63b44002aa156bec2fca18ec1eb8616dc5e8..6dd1cffbf094761f546ba55663f585c17bfc0d78 100644
--- a/data/json/SkillDefinition/86.json
+++ b/data/json/SkillDefinition/86.json
@@ -5,33 +5,24 @@
     "type": "SkillDefinition",
     "id": 86,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.667
+          "referenceId": "pv",
+          "baseValue": 1.0,
+          "factor": 1.1
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Voldorak Vo - Dark 2 - Projection Sordide",
   "m_availability": 3,
   "m_i18nNameId": 22376,
   "m_i18nDescriptionId": 2217,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/860.json b/data/json/SkillDefinition/860.json
index 2d92c5526f55903e9a06866c11ee738ae5710575..d61271411b8721b0df99e636182ddf2c0c8afa51 100644
--- a/data/json/SkillDefinition/860.json
+++ b/data/json/SkillDefinition/860.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 860,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/861.json b/data/json/SkillDefinition/861.json
index 8d171dc15ce513d5d1478d09f1988e0127eef3ff..2562b3e517a8fd9677e23a9d5dddedf242f24bce 100644
--- a/data/json/SkillDefinition/861.json
+++ b/data/json/SkillDefinition/861.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 861,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/8648.json b/data/json/SkillDefinition/8648.json
index 495e4f2aee12cad2a6ce3336d2d5937bed72013d..7a5fd1f82865cbe0646a9cb05cfb4d59555adea5 100644
--- a/data/json/SkillDefinition/8648.json
+++ b/data/json/SkillDefinition/8648.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8648,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/868.json b/data/json/SkillDefinition/868.json
index eb140690170c8e26bb9d56cd33f67c5d749131aa..058a55fee7a1f5b3f26d0ee8340b47793470935f 100644
--- a/data/json/SkillDefinition/868.json
+++ b/data/json/SkillDefinition/868.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 868,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/869.json b/data/json/SkillDefinition/869.json
index 3bc6fc8c05375f46dc4ecf624016d613e78f575c..b9aee3d92e3cf4a75198833f6a03830d1b9bbb4c 100644
--- a/data/json/SkillDefinition/869.json
+++ b/data/json/SkillDefinition/869.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 869,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/87.json b/data/json/SkillDefinition/87.json
index 561c4e401c1077e868e70d2f2fc8b41f04d69197..0bbd6b97e9f9f8b98538801af1194a780b1a5d86 100644
--- a/data/json/SkillDefinition/87.json
+++ b/data/json/SkillDefinition/87.json
@@ -5,21 +5,21 @@
     "type": "SkillDefinition",
     "id": 87,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.4
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "SHIELD",
-        "LIGHTNING"
+        "LIGHTNING",
+        "SHIELD"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/870.json b/data/json/SkillDefinition/870.json
index 404aeb33ad0d835bf5028d332c9712b1a7a0833e..9adbc8832673b8abfa7f8978f9c043c01af52cfa 100644
--- a/data/json/SkillDefinition/870.json
+++ b/data/json/SkillDefinition/870.json
@@ -20,7 +20,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/871.json b/data/json/SkillDefinition/871.json
index 0c3a49ec32d9c120f4f35e25591223db17f6de56..62fc6a17cbbf066689c9f2e7f8b27bf0529a3407 100644
--- a/data/json/SkillDefinition/871.json
+++ b/data/json/SkillDefinition/871.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 871,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/872.json b/data/json/SkillDefinition/872.json
index 4d7487d199fa736623efb58425513b563a33666d..2035b42691c7862573024f6c1d547f2575b9dbbc 100644
--- a/data/json/SkillDefinition/872.json
+++ b/data/json/SkillDefinition/872.json
@@ -5,26 +5,15 @@
     "type": "SkillDefinition",
     "id": 872,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.667
-        },
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc2",
-          "baseValue": 0.0,
-          "factor": 1.667
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 3
+          "referenceId": "ar",
+          "baseValue": 0.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
@@ -35,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 94992,
   "m_i18nDescriptionId": 80530,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/873.json b/data/json/SkillDefinition/873.json
index d4db731116dfc37fe1041a9d5f5a7323c2f5f86d..9f550293f5de4f89db420e55167ee25895dfdecd 100644
--- a/data/json/SkillDefinition/873.json
+++ b/data/json/SkillDefinition/873.json
@@ -5,24 +5,25 @@
     "type": "SkillDefinition",
     "id": 873,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "buffM",
           "baseValue": 0.0,
-          "factor": 1.667
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        }
+        "SIGHT"
       ]
     }
   },
@@ -30,5 +31,5 @@
   "m_availability": 3,
   "m_i18nNameId": 28566,
   "m_i18nDescriptionId": 69796,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/874.json b/data/json/SkillDefinition/874.json
index 6df0789b12cee9c2fc5ca9475c557c2f73a55625..d364c2e8ad92296b73c61ffc440f87772199a513 100644
--- a/data/json/SkillDefinition/874.json
+++ b/data/json/SkillDefinition/874.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 874,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/875.json b/data/json/SkillDefinition/875.json
index 5afc8331adc1e305c3892c628bad0e07d61d61c3..ba4c6ea7c024af72f5c8aab48d1ddf612c92057b 100644
--- a/data/json/SkillDefinition/875.json
+++ b/data/json/SkillDefinition/875.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 875,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/877.json b/data/json/SkillDefinition/877.json
index bf8c126c05fceab555db57e87f0761df275e168d..0980b6feb0e9f9bbbea3724706b458fcf438a9bb 100644
--- a/data/json/SkillDefinition/877.json
+++ b/data/json/SkillDefinition/877.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 877,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/878.json b/data/json/SkillDefinition/878.json
index 224beb5316798d8127e8e55b1475e00469308171..55f1a51897bbb9f1810d45d3b2ae862f0229ccf0 100644
--- a/data/json/SkillDefinition/878.json
+++ b/data/json/SkillDefinition/878.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 878,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/879.json b/data/json/SkillDefinition/879.json
index c302af9f689da43fe406830862265070c5213699..ed33f9514fff5377430a6ea3ff7d12545de004bd 100644
--- a/data/json/SkillDefinition/879.json
+++ b/data/json/SkillDefinition/879.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 879,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/881.json b/data/json/SkillDefinition/881.json
index 2241bd24544df84f2369a612fae10c66eb2f1bdf..75b1d05cee408fefb825a8e41c2c1c31206b7546 100644
--- a/data/json/SkillDefinition/881.json
+++ b/data/json/SkillDefinition/881.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 881,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/882.json b/data/json/SkillDefinition/882.json
index e0889834065333e08e87eb58457002a4197d99e6..96a271f3332ee2d13766c5f8d89d21aeff9cf86a 100644
--- a/data/json/SkillDefinition/882.json
+++ b/data/json/SkillDefinition/882.json
@@ -5,20 +5,19 @@
     "type": "SkillDefinition",
     "id": 882,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "referenceId": "boost",
+          "baseValue": 5.0,
+          "factor": 5.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "LIGHTNING",
         "SHIELD"
       ]
     }
@@ -27,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 42097,
   "m_i18nDescriptionId": 93845,
-  "assetGuid": "a52adb3fac6a36c409301e33bf8c5b82"
+  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/883.json b/data/json/SkillDefinition/883.json
index 9314771462065a4931dd302e3ac5791d19afdffa..d088d2b35de1268e7d3155fba719cf6fd036f095 100644
--- a/data/json/SkillDefinition/883.json
+++ b/data/json/SkillDefinition/883.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 883,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/8839.json b/data/json/SkillDefinition/8839.json
index 0a7ddacae020ceafa0205c7e18838751c8e71816..cd6708caac0fed1f2a17bfd26ca18625abe8dec7 100644
--- a/data/json/SkillDefinition/8839.json
+++ b/data/json/SkillDefinition/8839.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 8839,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/884.json b/data/json/SkillDefinition/884.json
index a0f8f2dc0c19439dfba3d3ec16341d893947fac6..87df3774f2861be39c67ab10b4fc01fbb90c8cf8 100644
--- a/data/json/SkillDefinition/884.json
+++ b/data/json/SkillDefinition/884.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 884,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 6
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 2.667
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/885.json b/data/json/SkillDefinition/885.json
index 5b55756a5cbc544742a9ed0fe93ae451ce5fc0ee..493f71edad519aa091dfd360365c3ae5bdefca4e 100644
--- a/data/json/SkillDefinition/885.json
+++ b/data/json/SkillDefinition/885.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 885,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/886.json b/data/json/SkillDefinition/886.json
index b204bf0a2baa658c50ddd00c3335180d0bd1e187..387a77bfa9bfffff21fbbc3ed46bfdbafc05bb45 100644
--- a/data/json/SkillDefinition/886.json
+++ b/data/json/SkillDefinition/886.json
@@ -5,30 +5,24 @@
     "type": "SkillDefinition",
     "id": 886,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 5.0
+          "referenceId": "dmg",
+          "baseValue": 10.0,
+          "factor": 6.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        }
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Flamboyante Kasaï - Empty 2 - Récupération Miroir",
   "m_availability": 3,
   "m_i18nNameId": 42773,
   "m_i18nDescriptionId": 22666,
-  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
+  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/888.json b/data/json/SkillDefinition/888.json
index 964b4016bb763c7734d517b87577ef93aec4c3f1..f7b5a63841bf0500faab2c1708658fc743970f2a 100644
--- a/data/json/SkillDefinition/888.json
+++ b/data/json/SkillDefinition/888.json
@@ -5,31 +5,24 @@
     "type": "SkillDefinition",
     "id": 888,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "ar",
           "baseValue": 0.0,
-          "factor": 1.667
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "METEOR"
-      ]
+      "keywordReferences": []
     }
   },
-  "m_displayName": "IOP - Bouvaloir Orok - Magma 1 - Traînée Explosif",
+  "m_displayName": "IOP - Bouvaloir Orok - Magma 1 - Traînée Explosive",
   "m_availability": 3,
   "m_i18nNameId": 53982,
   "m_i18nDescriptionId": 64557,
-  "assetGuid": "1493478f0ac258d4997720176d928817"
+  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/889.json b/data/json/SkillDefinition/889.json
index 5176359edb3da4898839e7066421869e257ebe4f..732197c73cfa0ddd890b466d96e2a4855c3fe95f 100644
--- a/data/json/SkillDefinition/889.json
+++ b/data/json/SkillDefinition/889.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 889,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/890.json b/data/json/SkillDefinition/890.json
index 2075907c536193fb680cc16fe1d4ba433c62fb2e..045ff368b6a5142a7c07f059c374f278145b7445 100644
--- a/data/json/SkillDefinition/890.json
+++ b/data/json/SkillDefinition/890.json
@@ -5,37 +5,15 @@
     "type": "SkillDefinition",
     "id": 890,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 26.67
-        },
-        {
-          "type": "PercentageOfValue",
-          "referenceId": "h",
-          "percentage": {
-            "type": "ConstIntegerValue",
-            "referenceId": "percPv",
-            "value": 5
-          },
-          "from": {
-            "type": "EntityCaracValue",
-            "referenceId": "",
-            "entitySelector": {
-              "type": "EffectHolderSelector"
-            },
-            "carac": 32
-          }
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percPv",
-          "value": 5
+          "factor": 1.2
         }
       ],
       "hasEffects": true,
@@ -46,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 67795,
   "m_i18nDescriptionId": 77623,
-  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
+  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/892.json b/data/json/SkillDefinition/892.json
index 86912980fee9639de7cc1127527fe779358cd4b4..61110d74d0c853ad67cfd767f40e6eb526789b56 100644
--- a/data/json/SkillDefinition/892.json
+++ b/data/json/SkillDefinition/892.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 75
+          "value": 1500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 75
+          "value": 1500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/893.json b/data/json/SkillDefinition/893.json
index dd3a0ad5e3e24c549367329fa0e1ef4fb54f175b..ad7545cfac1151c56ebb169bf88ac944f84316db 100644
--- a/data/json/SkillDefinition/893.json
+++ b/data/json/SkillDefinition/893.json
@@ -5,24 +5,24 @@
     "type": "SkillDefinition",
     "id": 893,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.0
+          "factor": 1.8
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
         "WAVE"
       ]
     }
@@ -31,5 +31,5 @@
   "m_availability": 3,
   "m_i18nNameId": 54892,
   "m_i18nDescriptionId": 24999,
-  "assetGuid": "9b9e302f9140c6e4a95a678d44061e44"
+  "assetGuid": "9085b25ad140f5f4c869893f5f173030"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/895.json b/data/json/SkillDefinition/895.json
index 56f3328a24716678ef57ef04163bb3e38cc1191a..b31eb977ecbf8986689874742d61c766317c5926 100644
--- a/data/json/SkillDefinition/895.json
+++ b/data/json/SkillDefinition/895.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 895,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/897.json b/data/json/SkillDefinition/897.json
index 044318e7f9d50994c779789ddc2fd41801f11f32..e014abe04ca4009f07db1a22b735f9840879e13a 100644
--- a/data/json/SkillDefinition/897.json
+++ b/data/json/SkillDefinition/897.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,13 +16,13 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 200
+          "value": 4000
         }
       },
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             18
           ]
@@ -30,23 +30,23 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 75
+          "value": 1500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "chance",
-          "value": 200
+          "value": 4000
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 75
+          "value": 1500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/9.json b/data/json/SkillDefinition/9.json
index e704c4099d2d9bc4663049321e056a9052b07fba..ea9c415c5595f158e8ecad41464d492445a51c5e 100644
--- a/data/json/SkillDefinition/9.json
+++ b/data/json/SkillDefinition/9.json
@@ -5,24 +5,31 @@
     "type": "SkillDefinition",
     "id": 9,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 3.0
+          "referenceId": "buffP",
+          "baseValue": 2.5,
+          "factor": 6.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Expingole - Light 2 - Assaut Céleste",
   "m_availability": 3,
   "m_i18nNameId": 41392,
   "m_i18nDescriptionId": 6705,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "3d6a5b935dbf65247a55f078f086eb43"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/90.json b/data/json/SkillDefinition/90.json
index d97abe36131e1801b9497d8b647ae299e104f8c1..b7d476590fb3e08d47d9575aff25158fc1212187 100644
--- a/data/json/SkillDefinition/90.json
+++ b/data/json/SkillDefinition/90.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 90,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/900.json b/data/json/SkillDefinition/900.json
index 05030ae58aedc61ed61dde7022407e872d521ffb..a68bdf8c6d3b3499810ae1d286388cbd6fe11c2c 100644
--- a/data/json/SkillDefinition/900.json
+++ b/data/json/SkillDefinition/900.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 900,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 23.33
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 6
         },
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "r",
-          "value": 1
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "buffP",
+          "baseValue": 0.0,
+          "factor": 7.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +29,5 @@
   "m_availability": 3,
   "m_i18nNameId": 73535,
   "m_i18nDescriptionId": 22481,
-  "assetGuid": "f4628f3d4f70e904f8326c5d15c2310b"
+  "assetGuid": "3d6a5b935dbf65247a55f078f086eb43"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/9017.json b/data/json/SkillDefinition/9017.json
index 1148830259fa18f1fe993a73bd0bbf6062e6767d..42cd1b082a6eb6333f2efd02e2fdd127a4dc1df4 100644
--- a/data/json/SkillDefinition/9017.json
+++ b/data/json/SkillDefinition/9017.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 9017,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/902.json b/data/json/SkillDefinition/902.json
index 8f6a2d48bc6b61d8e6bcafa267af4c538495a65e..c6d9129c0712ac246148cc454099c3f17385a97e 100644
--- a/data/json/SkillDefinition/902.json
+++ b/data/json/SkillDefinition/902.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 902,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/903.json b/data/json/SkillDefinition/903.json
index f4b50257d3b33ae47cfcfb0f8dd0eada37ef4a0b..b4fdfb60eb5ca0eedd498379cbecb80e1acb1689 100644
--- a/data/json/SkillDefinition/903.json
+++ b/data/json/SkillDefinition/903.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 903,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/9039.json b/data/json/SkillDefinition/9039.json
index 9f4cfe6818b013ea2d968c7a986be66900abbe00..52a4610a5cf55e7fb014558f6b0720d41b2c40d5 100644
--- a/data/json/SkillDefinition/9039.json
+++ b/data/json/SkillDefinition/9039.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 9039,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/904.json b/data/json/SkillDefinition/904.json
index be92946e5ddb0a5b29b1384d53c5ba53d85c1b6a..c58091f3d0fbf2564a079aac0bdb6f180838a3bb 100644
--- a/data/json/SkillDefinition/904.json
+++ b/data/json/SkillDefinition/904.json
@@ -5,21 +5,21 @@
     "type": "SkillDefinition",
     "id": 904,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.0
+          "referenceId": "dmg",
+          "baseValue": 1.0,
+          "factor": 1.4
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "SHIELD",
-        "WAVE"
+        "WAVE",
+        "SHIELD"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/905.json b/data/json/SkillDefinition/905.json
index 32157a7b2238612c52ba007c888884272bc24807..c097e89118f09ad24dd00da57597ec2cae4af37c 100644
--- a/data/json/SkillDefinition/905.json
+++ b/data/json/SkillDefinition/905.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 905,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 20.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 5
+          "referenceId": "mp",
+          "baseValue": 3.0,
+          "factor": 2.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 66445,
   "m_i18nDescriptionId": 33937,
-  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/907.json b/data/json/SkillDefinition/907.json
index 780b15c3a56f2b4bf04faa3b736f12cc87079b59..42c33a44c52e333ef956eecde0dd472a24907c6d 100644
--- a/data/json/SkillDefinition/907.json
+++ b/data/json/SkillDefinition/907.json
@@ -5,24 +5,26 @@
     "type": "SkillDefinition",
     "id": 907,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 46.66
-        },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "nb",
+          "referenceId": "s",
           "value": 2
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "pv",
+          "baseValue": 2.0,
+          "factor": 1.7
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Water 2 - Affûtage Humide",
diff --git a/data/json/SkillDefinition/909.json b/data/json/SkillDefinition/909.json
index c1c32ca33853f954f70b97604d2bd5777f5152ad..a201083e62e664552d42189726cdc624791ac1de 100644
--- a/data/json/SkillDefinition/909.json
+++ b/data/json/SkillDefinition/909.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 909,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/91.json b/data/json/SkillDefinition/91.json
index adbd204ba39dacbb27ea17db63c5f40f70c6579d..c3ff165a6de1c52e363b0e95fa120b5e96e05c33 100644
--- a/data/json/SkillDefinition/91.json
+++ b/data/json/SkillDefinition/91.json
@@ -5,32 +5,19 @@
     "type": "SkillDefinition",
     "id": 91,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 1
+          "baseValue": 1.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
         "SHADOW"
       ]
     }
@@ -39,5 +26,5 @@
   "m_availability": 3,
   "m_i18nNameId": 89321,
   "m_i18nDescriptionId": 51225,
-  "assetGuid": "c0ec3c93c39832c4f8577b0347c2d458"
+  "assetGuid": "1924e787deef5d14fa075790688d48bb"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/912.json b/data/json/SkillDefinition/912.json
index 51bfe0cb74937d3c3f716ad8ec828006da3b053d..088b4e527152b68a7b8f93c6fada90ceb48085f0 100644
--- a/data/json/SkillDefinition/912.json
+++ b/data/json/SkillDefinition/912.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 912,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/913.json b/data/json/SkillDefinition/913.json
index b9ddf9d05a2a754bedfb28c9d491ca3d2b33bf76..e05b4893e06fd37f9a7c74db2d5fd67432383f53 100644
--- a/data/json/SkillDefinition/913.json
+++ b/data/json/SkillDefinition/913.json
@@ -5,19 +5,24 @@
     "type": "SkillDefinition",
     "id": 913,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 4
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
+          "baseValue": 250.0,
           "factor": 50.0
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "r",
+          "referenceId": "pa",
           "value": 1
         }
       ],
diff --git a/data/json/SkillDefinition/914.json b/data/json/SkillDefinition/914.json
index 641003224e90e26016c507cc0994e4a05b7c2034..d75517f2af35c5ffcb754ce8d9e7e5ae5d0b1a7c 100644
--- a/data/json/SkillDefinition/914.json
+++ b/data/json/SkillDefinition/914.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 914,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/915.json b/data/json/SkillDefinition/915.json
index 8eb211576a2bb8e918d8d32a8316d81f50359ccb..47d6c366734b3dd0648fcf5f7d1363417e2f86da 100644
--- a/data/json/SkillDefinition/915.json
+++ b/data/json/SkillDefinition/915.json
@@ -5,14 +5,14 @@
     "type": "SkillDefinition",
     "id": 915,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
+          "referenceId": "dmg",
+          "baseValue": 1.0,
           "factor": 1.0
         }
       ],
diff --git a/data/json/SkillDefinition/916.json b/data/json/SkillDefinition/916.json
index 35c71385295155681ce23aacb982ecbdad92ee36..4510517322d0d3c48e256ab4558f71243e3df4ad 100644
--- a/data/json/SkillDefinition/916.json
+++ b/data/json/SkillDefinition/916.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 916,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/917.json b/data/json/SkillDefinition/917.json
index 3e0c9ca8c762b9c59db00eb9c222001549c630c3..9197a35f23e0924cd92d0073f687b8f16bab6cf8 100644
--- a/data/json/SkillDefinition/917.json
+++ b/data/json/SkillDefinition/917.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 917,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/918.json b/data/json/SkillDefinition/918.json
index 35fbdac3ae7e098bdea9f1636694a2baec9d0b69..da3f13fb1db30299f9f3b597abf2550094e07386 100644
--- a/data/json/SkillDefinition/918.json
+++ b/data/json/SkillDefinition/918.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 918,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/919.json b/data/json/SkillDefinition/919.json
index d17469a719d7fb74f781a0aadf59c940fa0800be..bbb3e21563f5bcd5fb56afeae2182bca89ca1aa5 100644
--- a/data/json/SkillDefinition/919.json
+++ b/data/json/SkillDefinition/919.json
@@ -5,20 +5,20 @@
     "type": "SkillDefinition",
     "id": 919,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 1.33
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "pa",
-          "value": 3
+          "value": 4
+        },
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 5.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/92.json b/data/json/SkillDefinition/92.json
index 52a1cac726694c4ebccbccaa931c095615018e10..b4a5e4b6b45627e2c4a81684807a5ccb1c9af641 100644
--- a/data/json/SkillDefinition/92.json
+++ b/data/json/SkillDefinition/92.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 92,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/921.json b/data/json/SkillDefinition/921.json
index cd26b09fb30d02ccb656ec31174c5795bcda5bfb..cb8e49c9cb818492649cc82d6366a4050cc8d542 100644
--- a/data/json/SkillDefinition/921.json
+++ b/data/json/SkillDefinition/921.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 921,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/922.json b/data/json/SkillDefinition/922.json
index 71f886614a7f87436dd25ff8dc995e96edfa455e..f563f684b713e628005df519eff2c8f443806ae8 100644
--- a/data/json/SkillDefinition/922.json
+++ b/data/json/SkillDefinition/922.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 922,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/923.json b/data/json/SkillDefinition/923.json
index e97e428f55107631a31bbd80a630594450366887..7fe5af034b4f04f7babc4e688bcc82ca68265278 100644
--- a/data/json/SkillDefinition/923.json
+++ b/data/json/SkillDefinition/923.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 923,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/924.json b/data/json/SkillDefinition/924.json
index 03c1dc4326ba58b3e71b5c701de0293d989cc62a..ec59c2dfee7a85870b1c8b19e33de1f29d1c22b5 100644
--- a/data/json/SkillDefinition/924.json
+++ b/data/json/SkillDefinition/924.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 924,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/928.json b/data/json/SkillDefinition/928.json
index 75ae07dfec2968a1bcb7aa1a2fa3e4a0df84639f..46e30ea3185373e4af039a85763df27132d9d55f 100644
--- a/data/json/SkillDefinition/928.json
+++ b/data/json/SkillDefinition/928.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 928,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmgM",
           "baseValue": 0.0,
-          "factor": 26.67
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 2
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -29,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 62055,
   "m_i18nDescriptionId": 1843,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "aebba4430daec0349b1317221a56a144"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/929.json b/data/json/SkillDefinition/929.json
index a5b1f2be009611fc7b5ddfa6daf7a6af2d58e6a6..21179580115dff353d88b3285d68fe6a2ed2400d 100644
--- a/data/json/SkillDefinition/929.json
+++ b/data/json/SkillDefinition/929.json
@@ -5,24 +5,21 @@
     "type": "SkillDefinition",
     "id": 929,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 46.66
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "nb",
-          "value": 2
+          "referenceId": "ar",
+          "baseValue": 0.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Earth 2 - Affûtage Argileux",
diff --git a/data/json/SkillDefinition/93.json b/data/json/SkillDefinition/93.json
index ba0fe3acdf3c97344ccb8dc3d586072a1e1f660a..0bb9cbdca4494215a0b37535736fcc0ff41f6d01 100644
--- a/data/json/SkillDefinition/93.json
+++ b/data/json/SkillDefinition/93.json
@@ -5,20 +5,15 @@
     "type": "SkillDefinition",
     "id": 93,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "referenceId": "dmg",
+          "baseValue": 3.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/930.json b/data/json/SkillDefinition/930.json
index 71a0de6d40c005d56b447c86d1c3f1bfeace25dc..db99fb09c1dc8ae640acca39592c523454a4fd21 100644
--- a/data/json/SkillDefinition/930.json
+++ b/data/json/SkillDefinition/930.json
@@ -5,20 +5,21 @@
     "type": "SkillDefinition",
     "id": 930,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "baseValue": 1.0,
+          "factor": 1.1
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "LIGHTNING"
+        "LIGHTNING",
+        "SIGHT"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/932.json b/data/json/SkillDefinition/932.json
index d4d251b7ae2ef0935a28bb7cca5a9dee6bede878..1cfd9a461982d86da5fd10f5e123010a281a5f9d 100644
--- a/data/json/SkillDefinition/932.json
+++ b/data/json/SkillDefinition/932.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 932,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/939.json b/data/json/SkillDefinition/939.json
index 9dac7e41f85dc5c7cbb9976e426875aa1acd0315..0a3b6ed4c1dc39e4a752ba2619b619d1791e67b7 100644
--- a/data/json/SkillDefinition/939.json
+++ b/data/json/SkillDefinition/939.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 939,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/94.json b/data/json/SkillDefinition/94.json
index 0fe48e6c4fa12883a055a442b89e89ebfdd0d5da..88ed958a63f7cefb58813944c3633903f5eb83d7 100644
--- a/data/json/SkillDefinition/94.json
+++ b/data/json/SkillDefinition/94.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 94,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/940.json b/data/json/SkillDefinition/940.json
index aa67872b1470e2d5c74ebe92af0f5d88b8d0593d..938f4bf2720e6181ac35672717c2fe3b0f9e9c79 100644
--- a/data/json/SkillDefinition/940.json
+++ b/data/json/SkillDefinition/940.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 940,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/9406.json b/data/json/SkillDefinition/9406.json
index 0a1a84cb06ff705bf4c56a81b4e146d51f25f860..4efaee14c78bc87daf99dda8d1c10aa7c8f04c36 100644
--- a/data/json/SkillDefinition/9406.json
+++ b/data/json/SkillDefinition/9406.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 9406,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/942.json b/data/json/SkillDefinition/942.json
index 66dec1abd216a2afb1d50224bb00c13f8329fd7e..cab466f255748dd039e70cb415e34b38e7b36902 100644
--- a/data/json/SkillDefinition/942.json
+++ b/data/json/SkillDefinition/942.json
@@ -5,29 +5,19 @@
     "type": "SkillDefinition",
     "id": 942,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
+          "referenceId": "pv",
+          "baseValue": 3.0,
           "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "SHADOW"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Aiguille Pikuxala - Dark 2 - Téléportation Ténébreuse",
diff --git a/data/json/SkillDefinition/949.json b/data/json/SkillDefinition/949.json
index d1722d1923a372cedd3fcbcb91b96339b798e568..82cb08d08360dbcb40046b18690d248a8e66c2ce 100644
--- a/data/json/SkillDefinition/949.json
+++ b/data/json/SkillDefinition/949.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 949,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/95.json b/data/json/SkillDefinition/95.json
index 44f359790ed90fbab8939597e6014914dc5539ed..0cc4d46f2c8c12424d2d7bfdb64c72fa170aeee1 100644
--- a/data/json/SkillDefinition/95.json
+++ b/data/json/SkillDefinition/95.json
@@ -5,20 +5,21 @@
     "type": "SkillDefinition",
     "id": 95,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 5.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "LIGHTNING"
+        "LIGHTNING",
+        "PHASE"
       ]
     }
   },
diff --git a/data/json/SkillDefinition/952.json b/data/json/SkillDefinition/952.json
index d9e31a36cb435f73614cef6798d093e8d2b05c48..33973bc8d3b22949672169006f861c54a356fa21 100644
--- a/data/json/SkillDefinition/952.json
+++ b/data/json/SkillDefinition/952.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 952,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/954.json b/data/json/SkillDefinition/954.json
index 9c680f013f79da6bf2a443c4f2a745fd46732adc..a590078944064067e1b6f18ca50d90fe7ffbb800 100644
--- a/data/json/SkillDefinition/954.json
+++ b/data/json/SkillDefinition/954.json
@@ -5,15 +5,20 @@
     "type": "SkillDefinition",
     "id": 954,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 6
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 4.0
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/955.json b/data/json/SkillDefinition/955.json
index 49dad7f1e081581570fa129263ae7e97d830c851..4ef489c40fc0fed8c95cf8aaf9cf1e41aa40a1c5 100644
--- a/data/json/SkillDefinition/955.json
+++ b/data/json/SkillDefinition/955.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 955,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/958.json b/data/json/SkillDefinition/958.json
index ccc73644dec3e2ffd75d37edce367327238a6978..9ae2c46be574de933ada0c097ddb6012e4637df9 100644
--- a/data/json/SkillDefinition/958.json
+++ b/data/json/SkillDefinition/958.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 958,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/959.json b/data/json/SkillDefinition/959.json
index 35b0c82da56ef83fbd405136ebd10ff1b0a686e1..7c51d6c0a9d86543c2330ffd972cecf8bf69bb8b 100644
--- a/data/json/SkillDefinition/959.json
+++ b/data/json/SkillDefinition/959.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 150
+          "value": 3000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 150
+          "value": 3000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/962.json b/data/json/SkillDefinition/962.json
index 4cdad6289b3a940d08700efc7c7e75757e04f3fa..6eb41f331f2c2d9aa35d576c70a4d86bea7d4367 100644
--- a/data/json/SkillDefinition/962.json
+++ b/data/json/SkillDefinition/962.json
@@ -5,26 +5,29 @@
     "type": "SkillDefinition",
     "id": 962,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ad",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.0
+          "referenceId": "ar",
+          "baseValue": 1.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "METEOR"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Régulant Gurpapa - Magma 2 - Cuirasse Solide",
   "m_availability": 3,
   "m_i18nNameId": 17538,
   "m_i18nDescriptionId": 98380,
-  "assetGuid": "0fdc0080cb977ce4d8f4cd00cc97533e"
+  "assetGuid": "796df96635c9dc9408e0c072bee180b9"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/963.json b/data/json/SkillDefinition/963.json
index 33d29fb5a76db94255945c07ccc515abe87eeadf..65ad5ccb7ad4fde927a34810f5ffbe4aa68bc4b9 100644
--- a/data/json/SkillDefinition/963.json
+++ b/data/json/SkillDefinition/963.json
@@ -5,31 +5,29 @@
     "type": "SkillDefinition",
     "id": 963,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 1.0
-        },
-        {
-          "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc2",
-          "baseValue": 0.0,
-          "factor": 2.0
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 3
+          "factor": 4.0
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "METEOR"
+        "EXPLOSION",
+        "MECHANISM",
+        {
+          "type": 7,
+          "id": 1364
+        },
+        {
+          "type": 25,
+          "id": 74167
+        }
       ]
     }
   },
@@ -37,5 +35,5 @@
   "m_availability": 3,
   "m_i18nNameId": 84189,
   "m_i18nDescriptionId": 83694,
-  "assetGuid": "1493478f0ac258d4997720176d928817"
+  "assetGuid": "ce84276fddd9e704990080d076eb4257"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/964.json b/data/json/SkillDefinition/964.json
index 0d9ca973666b039a41bcdf29ec62f08fa694e416..a51e02ce081894e4ddb80936e45210bcd4fdd3c4 100644
--- a/data/json/SkillDefinition/964.json
+++ b/data/json/SkillDefinition/964.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 964,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/965.json b/data/json/SkillDefinition/965.json
index 46ee4ca8643de2415ed38285dce55d55871a712b..2ac3a36319659af2da792e78e742244b87137fd9 100644
--- a/data/json/SkillDefinition/965.json
+++ b/data/json/SkillDefinition/965.json
@@ -5,25 +5,15 @@
     "type": "SkillDefinition",
     "id": 965,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 1
-        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 33.33
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "percAt",
-          "value": 60
+          "referenceId": "dmgM",
+          "baseValue": 5.0,
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
@@ -34,5 +24,5 @@
   "m_availability": 3,
   "m_i18nNameId": 81540,
   "m_i18nDescriptionId": 43812,
-  "assetGuid": "02c1dad313e7ca64f805a44b534cf729"
+  "assetGuid": "853c49cdc1e1cf44a91c4d8c6df7a206"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/966.json b/data/json/SkillDefinition/966.json
index 2c1d9cb836737c73d076569a74e99cda3f6335e0..ff875a9770afe4e27bdb93ffd5859f1d843ec8dd 100644
--- a/data/json/SkillDefinition/966.json
+++ b/data/json/SkillDefinition/966.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 966,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
@@ -13,7 +13,7 @@
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
           "baseValue": 0.0,
-          "factor": 3.667
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SkillDefinition/968.json b/data/json/SkillDefinition/968.json
index 7abfd31a3914544717ff1cb47528c4369d22c8d6..b9cdc238f074acf014ac4bf56d3ebed5ed8e759b 100644
--- a/data/json/SkillDefinition/968.json
+++ b/data/json/SkillDefinition/968.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 968,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/969.json b/data/json/SkillDefinition/969.json
index 02993252f89d332a7e78aa95ba6e378f91890d6d..59aa0d83daf9d9a0daa7633d7938dbb5ef9dd2ae 100644
--- a/data/json/SkillDefinition/969.json
+++ b/data/json/SkillDefinition/969.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 969,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/972.json b/data/json/SkillDefinition/972.json
index 4c63fa1899504f5cb272c0b1c55db656dcaadef9..e65139e12c5a6a2cbb7835958bb7971feb101154 100644
--- a/data/json/SkillDefinition/972.json
+++ b/data/json/SkillDefinition/972.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 972,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/975.json b/data/json/SkillDefinition/975.json
index 7fa9d304e4f8340121567a9d9d4ac7e50f9ce685..95252ecd20bd64bf2dd7ddbf9a137117be17e0ab 100644
--- a/data/json/SkillDefinition/975.json
+++ b/data/json/SkillDefinition/975.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 975,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/977.json b/data/json/SkillDefinition/977.json
index 19afb5caade879b59f2bcdeaae5246c023e0e6dd..6109ebdc079e56ea876ea476bc51e22c44f5bd3f 100644
--- a/data/json/SkillDefinition/977.json
+++ b/data/json/SkillDefinition/977.json
@@ -5,26 +5,19 @@
     "type": "SkillDefinition",
     "id": 977,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
+          "referenceId": "buffM",
+          "baseValue": 3.0,
           "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
-        "WAVE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "XELOR - Aiguille Pikuxala - Empty 2 - Téléportation Furtive",
diff --git a/data/json/SkillDefinition/978.json b/data/json/SkillDefinition/978.json
index a5e6082b70f9a08615f2009c0da88c64c1399d92..4deca5af15c1cfda3b78edd5884a257ce3672fd1 100644
--- a/data/json/SkillDefinition/978.json
+++ b/data/json/SkillDefinition/978.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 978,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/981.json b/data/json/SkillDefinition/981.json
index b6f6e00bfd2e20b51a559bf90a72b65f19a7c464..7981299e06d9f6685be8f9b97c9516a1bf683b31 100644
--- a/data/json/SkillDefinition/981.json
+++ b/data/json/SkillDefinition/981.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 981,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/982.json b/data/json/SkillDefinition/982.json
index 67bbf8ead27d31095f02ff6e1888650a20921ed6..2d7e9935b6416a99586415465af9ff1dd96fff61 100644
--- a/data/json/SkillDefinition/982.json
+++ b/data/json/SkillDefinition/982.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             16
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 400
+          "value": 8000
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 400
+          "value": 8000
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SkillDefinition/983.json b/data/json/SkillDefinition/983.json
index 3ce7083c3ce6f933e566281667d39be817c17f95..0cdcd3602eb079e9620c8db6bf4ab7f698fbdc88 100644
--- a/data/json/SkillDefinition/983.json
+++ b/data/json/SkillDefinition/983.json
@@ -5,19 +5,21 @@
     "type": "SkillDefinition",
     "id": 983,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
+          "referenceId": "dmg",
           "baseValue": 0.0,
-          "factor": 26.66
+          "factor": 1.0
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "EXPLOSION"
+      ]
     }
   },
   "m_displayName": "XELOR - Fire 3 - Construction Agressive",
diff --git a/data/json/SkillDefinition/984.json b/data/json/SkillDefinition/984.json
index 690a9b50f9dd9b261bbd774b5205fe2bd5894b0d..0ef133a3daaf5d994178950163e2f8b49dc88990 100644
--- a/data/json/SkillDefinition/984.json
+++ b/data/json/SkillDefinition/984.json
@@ -5,19 +5,21 @@
     "type": "SkillDefinition",
     "id": 984,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
           "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 4.33
+          "baseValue": 2.5,
+          "factor": 6.5
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "EXPLOSION",
+        "SIGHT",
         "METEORSIGHT"
       ]
     }
diff --git a/data/json/SkillDefinition/985.json b/data/json/SkillDefinition/985.json
index 8fd7fb94558392e60c5c91974f008a219e711f46..1d6c1879191ee727172c2c391648cd544e583160 100644
--- a/data/json/SkillDefinition/985.json
+++ b/data/json/SkillDefinition/985.json
@@ -5,29 +5,27 @@
     "type": "SkillDefinition",
     "id": 985,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 26.67
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pa",
-          "value": 2
+          "referenceId": "dmg",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "BOUNCE",
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Air 6 - Archer du Ciel",
   "m_availability": 3,
   "m_i18nNameId": 58965,
   "m_i18nDescriptionId": 92338,
-  "assetGuid": "21cfc230c0dc3954db8d7b5872d64267"
+  "assetGuid": "0125556b33fbb453f83eb6e15209391b"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/987.json b/data/json/SkillDefinition/987.json
index f50599bfcbe7c16d128be2e6ea4b73b532b0130c..d1c135b7f42754fbe770aeee86768186e5769ae7 100644
--- a/data/json/SkillDefinition/987.json
+++ b/data/json/SkillDefinition/987.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 987,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/989.json b/data/json/SkillDefinition/989.json
index f3a3973ce8c6297ab5b39b4d57f953799b6ae5a3..d7c13907a1688b7363fe5d6fb8cacc35f083fecf 100644
--- a/data/json/SkillDefinition/989.json
+++ b/data/json/SkillDefinition/989.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 989,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/99.json b/data/json/SkillDefinition/99.json
index 90bbf51ac79a97f6976c1e8e5512133952e54bdf..0872e95c8e307bbe563921f673ac69cc19b8edb6 100644
--- a/data/json/SkillDefinition/99.json
+++ b/data/json/SkillDefinition/99.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 99,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/991.json b/data/json/SkillDefinition/991.json
index ed03c8c7408edfab9ec3d7c475e3afa215b73c1a..bfc8a405e4fa6d8468b2f4d451bb01e6d6054b25 100644
--- a/data/json/SkillDefinition/991.json
+++ b/data/json/SkillDefinition/991.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 991,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
diff --git a/data/json/SkillDefinition/992.json b/data/json/SkillDefinition/992.json
index 3950176edfba5b570b9069785ed33033a5855a32..57bae0b295af0e53d0ae067f691196c7e0bac647 100644
--- a/data/json/SkillDefinition/992.json
+++ b/data/json/SkillDefinition/992.json
@@ -5,34 +5,29 @@
     "type": "SkillDefinition",
     "id": 992,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "nb",
+          "value": 2
+        },
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 2.33
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "BOUNCE"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "CRA - Bunelame - Dark 2 - Écho Corrompu",
   "m_availability": 3,
   "m_i18nNameId": 13260,
   "m_i18nDescriptionId": 71328,
-  "assetGuid": "031c086b9596dce4dae062a9db1c6399"
+  "assetGuid": "fe8d396c86193e944b2c64db5a97cfe6"
 }
\ No newline at end of file
diff --git a/data/json/SkillDefinition/994.json b/data/json/SkillDefinition/994.json
index a4ee9e6b04dfdad6b34dcbfb66831187769cbeb7..6f1c297ab4e332be92c824a0718de855af4f97bd 100644
--- a/data/json/SkillDefinition/994.json
+++ b/data/json/SkillDefinition/994.json
@@ -5,26 +5,19 @@
     "type": "SkillDefinition",
     "id": 994,
     "passiveModifiers": [],
-    "isCompanionSkill": false,
+    "skillUsageType": 0,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "LinearLevelOnlyBasedDynamicValue",
-          "referenceId": "perc",
-          "baseValue": 0.0,
-          "factor": 26.67
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "aura",
-          "value": 2
+          "referenceId": "pv",
+          "baseValue": 2.5,
+          "factor": 1.5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "ICESWORD"
-      ]
+      "keywordReferences": []
     }
   },
   "m_displayName": "IOP - Water 6 - Bretteur des Mers",
diff --git a/data/json/SkillDefinition/995.json b/data/json/SkillDefinition/995.json
index 1ff0b36dab414d985275d92d5fd76a6a9482a8a6..677d1406a4b97497778631de365714582fe71996 100644
--- a/data/json/SkillDefinition/995.json
+++ b/data/json/SkillDefinition/995.json
@@ -17,7 +17,7 @@
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/998.json b/data/json/SkillDefinition/998.json
index bdce74fd309c9352bd98b3e89b0b5b7e28406ea7..3c7b39dab5d6ea98daf5c02e1fafc476496fd3cf 100644
--- a/data/json/SkillDefinition/998.json
+++ b/data/json/SkillDefinition/998.json
@@ -5,7 +5,7 @@
     "type": "SkillDefinition",
     "id": 998,
     "passiveModifiers": [],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
diff --git a/data/json/SkillDefinition/999.json b/data/json/SkillDefinition/999.json
index b5e1a2fe71fab9b5cd2a5a9aa4427bd0887eaf9b..6ddf892b8a3a05438d39627d39599852db0b207c 100644
--- a/data/json/SkillDefinition/999.json
+++ b/data/json/SkillDefinition/999.json
@@ -8,7 +8,7 @@
       {
         "type": "PassiveModifier",
         "modifier": {
-          "type": "BuffModifier",
+          "type": "BodyModifier",
           "caracIds": [
             76
           ]
@@ -16,18 +16,18 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 150
+          "value": 1500
         }
       }
     ],
-    "isCompanionSkill": true,
+    "skillUsageType": 1,
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
           "referenceId": "stat",
-          "value": 150
+          "value": 1500
         }
       ],
       "hasEffects": false,
diff --git a/data/json/SpellDefinition/10.json b/data/json/SpellDefinition/10.json
index 95bd3a3063fc6244447c62f6ac15dd91b3792c3f..4e7c79b436619e4d51d13e70434ebb6daf8fae3d 100644
--- a/data/json/SpellDefinition/10.json
+++ b/data/json/SpellDefinition/10.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 10,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/101.json b/data/json/SpellDefinition/101.json
index faa61a11f2f9bfe7eebffe4e7e0a406aba2a2679..dc2c90b68dee196a1ebefff692e1310b6e873d40 100644
--- a/data/json/SpellDefinition/101.json
+++ b/data/json/SpellDefinition/101.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 101,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/102.json b/data/json/SpellDefinition/102.json
index c2eec3949a3e40b012c88607c510491f28581796..ce23402e3aa0436de447c6a90ed190369c46af4c 100644
--- a/data/json/SpellDefinition/102.json
+++ b/data/json/SpellDefinition/102.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 102,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,39 +46,39 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 29.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min2",
           "baseValue": 35.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 40.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/10246.json b/data/json/SpellDefinition/10246.json
index 2a9b4093b42c4551a230f1520cae211c024a3370..69b5fadfda549ac609e07034c4ab787f1b63865b 100644
--- a/data/json/SpellDefinition/10246.json
+++ b/data/json/SpellDefinition/10246.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 10246,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,30 +55,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 4.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 8.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/103.json b/data/json/SpellDefinition/103.json
index ba6ff98f50c7e3acc60848aa8a39f8b0cb06c9ec..f451463644e35a6258a69e9f03028b19ea09245c 100644
--- a/data/json/SpellDefinition/103.json
+++ b/data/json/SpellDefinition/103.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 103,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -99,21 +100,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 38.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 47.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/10399.json b/data/json/SpellDefinition/10399.json
index 2596e70b059bf3c02b0465f7b6d6981bcf8c351e..c84fa0747624e29d5a378345cb747389e51080a7 100644
--- a/data/json/SpellDefinition/10399.json
+++ b/data/json/SpellDefinition/10399.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 10399,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/104.json b/data/json/SpellDefinition/104.json
index 31010014499f58e92b134f2c7e8819a1f67c6eaf..4625987479973a64fc5b28de34a24021d5f2f0f4 100644
--- a/data/json/SpellDefinition/104.json
+++ b/data/json/SpellDefinition/104.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 104,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -48,30 +49,26 @@
           "value": 3
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 30.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 10.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 40
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg1",
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/105.json b/data/json/SpellDefinition/105.json
index de0fe5024c20589e5dda0730b64f8ac19653e31b..a3f2fdf7d3c098dd0fbb78fedf559498972cf87d 100644
--- a/data/json/SpellDefinition/105.json
+++ b/data/json/SpellDefinition/105.json
@@ -4,12 +4,14 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 105,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "equipable": false,
       "families": [
-        0
+        0,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/106.json b/data/json/SpellDefinition/106.json
index 63d0502cb4c08859126ff4cf2c0e724d7bdb7827..e3775d19407479015618a225ef22ae21c8f21e8e 100644
--- a/data/json/SpellDefinition/106.json
+++ b/data/json/SpellDefinition/106.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 106,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/108.json b/data/json/SpellDefinition/108.json
index 4191218eaf2f66242c98931050661741e01b3f0d..7cf634923e7b82b20581ce65a1fbd900d4b30b24 100644
--- a/data/json/SpellDefinition/108.json
+++ b/data/json/SpellDefinition/108.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 108,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/109.json b/data/json/SpellDefinition/109.json
index 25f2439c0696355e8da26e2b52b07c6f2bc20d1a..336fbf09ebcb066a5a87c36a6454f72f2ada8c38 100644
--- a/data/json/SpellDefinition/109.json
+++ b/data/json/SpellDefinition/109.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 109,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/11.json b/data/json/SpellDefinition/11.json
index 60fcb56591557c7cab25feb439d5a3136f8de806..640a26b674fd81af0a31367dba15d3021ff7ebeb 100644
--- a/data/json/SpellDefinition/11.json
+++ b/data/json/SpellDefinition/11.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 11,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/110.json b/data/json/SpellDefinition/110.json
index 16b871ddbab9c502be70b36eadea816c72940dba..d035a01239f0b2ee8f64428caef816cf63f2a943 100644
--- a/data/json/SpellDefinition/110.json
+++ b/data/json/SpellDefinition/110.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 110,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/1105.json b/data/json/SpellDefinition/1105.json
index 5b54950a304b22b31544917516c6312d605309e3..320cdc4f5eb3fe15f09e9d27da7dfd3443656bc1 100644
--- a/data/json/SpellDefinition/1105.json
+++ b/data/json/SpellDefinition/1105.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 1105,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/112.json b/data/json/SpellDefinition/112.json
index 8fecf1aa04bd8343789f483ddc738db950727c89..e2b6c1aac139d6321227cceb04cc28c71d6e5a28 100644
--- a/data/json/SpellDefinition/112.json
+++ b/data/json/SpellDefinition/112.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 112,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/113.json b/data/json/SpellDefinition/113.json
index d9c558519b02cf198113213e761fdb8955a4c483..7ce26c193790cdf899290002eebad83f56590bc1 100644
--- a/data/json/SpellDefinition/113.json
+++ b/data/json/SpellDefinition/113.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 113,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/114.json b/data/json/SpellDefinition/114.json
index eea5754bdbd723e0f0b4d7b807d5a75c554784d6..224ee1ce4fc8d3f59df6f4f959d66fe608c475f5 100644
--- a/data/json/SpellDefinition/114.json
+++ b/data/json/SpellDefinition/114.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 114,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -77,7 +78,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     }
   },
   "m_displayName": "CRA - Décharge Pétulante",
diff --git a/data/json/SpellDefinition/115.json b/data/json/SpellDefinition/115.json
index c933239677f0f05699dfb08c8c6407091d856747..8a24eee9ccf1216c5cfb7f756b453969c2d02faf 100644
--- a/data/json/SpellDefinition/115.json
+++ b/data/json/SpellDefinition/115.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 115,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/116.json b/data/json/SpellDefinition/116.json
index dfddba77b509ba4f577a177521dc4bdd71ca1863..72817a0d3646e2a4315a168474284c5faf26a8d5 100644
--- a/data/json/SpellDefinition/116.json
+++ b/data/json/SpellDefinition/116.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 116,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,7 +44,7 @@
     "spellEffectData": [
       {
         "type": "SpellEffectInstantiationData",
-        "spellEffect": "381203b4e09bdbc4cba795bffe224b88",
+        "spellEffect": "b16a38f89aeca2042bd98c215ac4c967",
         "originTarget": {
           "type": "FirstCastTargetSelector"
         }
@@ -70,12 +71,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
         "CHAMPIONAURA",
-        {
-          "type": 25,
-          "id": 38
-        }
+        "DEATHBLOW"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/117.json b/data/json/SpellDefinition/117.json
index a4cb97b572214bed8ff936949d04ac3212e0c88d..bd351b4aa17fd2c62a6b08f8b87b8439533d72e5 100644
--- a/data/json/SpellDefinition/117.json
+++ b/data/json/SpellDefinition/117.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 117,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/118.json b/data/json/SpellDefinition/118.json
index 877a53adfb96e54b15f301f9f18a8dba27790f0b..e3d6c214ba5a3d2fbd916ace7ff4694014e95ce1 100644
--- a/data/json/SpellDefinition/118.json
+++ b/data/json/SpellDefinition/118.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 118,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -82,27 +83,8 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmg",
-          "baseValue": 27.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "h",
-          "baseValue": 54.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        }
-      ],
-      "hasEffects": true,
+      "dynamicValueReferences": [],
+      "hasEffects": false,
       "keywordReferences": []
     }
   },
diff --git a/data/json/SpellDefinition/119.json b/data/json/SpellDefinition/119.json
index 40b47600a01d1a9556ebccbf4b481f227a97f9d9..a8f427a1b931b5ee25723e3e3092ac0a4409956c 100644
--- a/data/json/SpellDefinition/119.json
+++ b/data/json/SpellDefinition/119.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 119,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/12.json b/data/json/SpellDefinition/12.json
index e3283e28fe7220572eb35927beb5a81fea4d3dd9..0b3e7a6d85b9c8666fd08fac62905b8b73c340cc 100644
--- a/data/json/SpellDefinition/12.json
+++ b/data/json/SpellDefinition/12.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 12,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "FANTOME - Frayeur Salvatrice",
diff --git a/data/json/SpellDefinition/120.json b/data/json/SpellDefinition/120.json
index 32e35831f2ee6aa2e526381c80fcc12adefb6b5f..b5a06f9d44a8fab2fbbd431ee7603ae05986ed75 100644
--- a/data/json/SpellDefinition/120.json
+++ b/data/json/SpellDefinition/120.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 120,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/121.json b/data/json/SpellDefinition/121.json
index f06d9258a4e3c30230dd79bb56708215e3493870..8dcc4c8c17cc70cb22f611e812a691d9d1350e67 100644
--- a/data/json/SpellDefinition/121.json
+++ b/data/json/SpellDefinition/121.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 121,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/122.json b/data/json/SpellDefinition/122.json
index d9e0e6899d34c003cd4acdc3a3b2a75ee9c2f668..4d08f4acf71cb7b0eb1646873bb24ba2478187ae 100644
--- a/data/json/SpellDefinition/122.json
+++ b/data/json/SpellDefinition/122.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 122,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/123.json b/data/json/SpellDefinition/123.json
index b3cbad8e5b182ffc00e9781ccd704974b1c0767d..fc2024137fe201d2caadc9a4b0918335341df068 100644
--- a/data/json/SpellDefinition/123.json
+++ b/data/json/SpellDefinition/123.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 123,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,13 +64,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 10.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 50
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/124.json b/data/json/SpellDefinition/124.json
index 721b9a92450337ffb9151752d05442cd5388a15a..29b6b290b1ce698c5ffa0a6ce11395590d268845 100644
--- a/data/json/SpellDefinition/124.json
+++ b/data/json/SpellDefinition/124.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 124,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/125.json b/data/json/SpellDefinition/125.json
index e1baa5a788c13bbda000b683b651d4fc269e99d3..2b77ec14c5c7c96131549676c4b6621d69e1c87e 100644
--- a/data/json/SpellDefinition/125.json
+++ b/data/json/SpellDefinition/125.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 125,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -99,21 +100,21 @@
           "value": 3
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/126.json b/data/json/SpellDefinition/126.json
index 71fb7b54e052993bb832b22010a1368851f8e641..cf65bd7bc04761a8210ff8e43f8f1afdb426cb94 100644
--- a/data/json/SpellDefinition/126.json
+++ b/data/json/SpellDefinition/126.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 126,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/127.json b/data/json/SpellDefinition/127.json
index a9c5775108769ebc5bee5b3535b149610b7d97bd..2434c64a8e8dd7d7dfc1dc02ca639469f5a80765 100644
--- a/data/json/SpellDefinition/127.json
+++ b/data/json/SpellDefinition/127.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 127,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/12735.json b/data/json/SpellDefinition/12735.json
index 6afcfa6909a1d327bec64113f72609a1cccd076a..c11417882e1752cb71e509de1026f028ec34e076 100644
--- a/data/json/SpellDefinition/12735.json
+++ b/data/json/SpellDefinition/12735.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 12735,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/128.json b/data/json/SpellDefinition/128.json
index e0206fe2eccd28d5f7ff439c2f1b6fa3489d51d8..a734fd58ba31dd7875b98c8a8dc839537c86dc90 100644
--- a/data/json/SpellDefinition/128.json
+++ b/data/json/SpellDefinition/128.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 128,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,20 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
+        "type": "FilteredCharacterSelector",
         "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          },
           {
             "type": "TeamFilter",
             "isIdentical": true,
diff --git a/data/json/SpellDefinition/13.json b/data/json/SpellDefinition/13.json
index 3aa4303af390e51b267e728d63234afea31b0377..ba15e43736d0d189af6621216b81eb0878a196db 100644
--- a/data/json/SpellDefinition/13.json
+++ b/data/json/SpellDefinition/13.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 13,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/132.json b/data/json/SpellDefinition/132.json
index 74a001cc4748fb580999491cb8399cbad70f0db1..d9294a839e4f16fa9cf9cb202740199f8ca54d48 100644
--- a/data/json/SpellDefinition/132.json
+++ b/data/json/SpellDefinition/132.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 132,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -92,6 +93,6 @@
   "m_i18nNameId": 14881,
   "m_i18nDescriptionId": 89869,
   "m_elementaryStates": 1,
-  "assetGuid": "4a2038f53e564a94896e371535cbdd5c",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/133.json b/data/json/SpellDefinition/133.json
index 600a82a4c5ab17d3af94a3f3f0fa806ae753a55e..f00dc848573f736c280973dda98d0da8b7a6549d 100644
--- a/data/json/SpellDefinition/133.json
+++ b/data/json/SpellDefinition/133.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 133,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 12.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/13388.json b/data/json/SpellDefinition/13388.json
index ac429dd9e09b1210ec3d0b78de7ec958bbfc582c..89ffab9fc04e52e24256258cfce1fb61c2988873 100644
--- a/data/json/SpellDefinition/13388.json
+++ b/data/json/SpellDefinition/13388.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 13388,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/135.json b/data/json/SpellDefinition/135.json
index 5413d2e653e74174e3958e6dcc25f8d650dc7676..a77ea90d3e1b208e43abc98a849a2631c5b76057 100644
--- a/data/json/SpellDefinition/135.json
+++ b/data/json/SpellDefinition/135.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 135,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/1355.json b/data/json/SpellDefinition/1355.json
index 70e79abefa46e1e161a3fa7b246ca2d8d4239372..b1bcd4ff70e72cbaa2b751779e59d2263a0ff000 100644
--- a/data/json/SpellDefinition/1355.json
+++ b/data/json/SpellDefinition/1355.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 1355,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": false,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
@@ -146,7 +148,6 @@
   "m_i18nNameId": 29325,
   "m_i18nDescriptionId": 80092,
   "m_elementaryStates": 1,
-  "assetGuid": "d0a127a95a557254188df0eba4f876dc",
-  "size": 1,
-  "data": 400
+  "assetGuid": "643f80f1cf3183e42a21b7187213d99c",
+  "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/13850.json b/data/json/SpellDefinition/13850.json
index b2249f6e2821386bf6accfc0871185ed336f0575..e9e4b71ee6c64022fd5f475a4b6aebcbe0704223 100644
--- a/data/json/SpellDefinition/13850.json
+++ b/data/json/SpellDefinition/13850.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 13850,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/139.json b/data/json/SpellDefinition/139.json
index 4acd179255a530ac487d5f65d4b13b60953026aa..aa14d4254635cc0945f2001f3cd6a3455fdba710 100644
--- a/data/json/SpellDefinition/139.json
+++ b/data/json/SpellDefinition/139.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 139,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/13913.json b/data/json/SpellDefinition/13913.json
index ad85571657196249ce2b0d82ac38dc3b1cdf12ca..77738d9a6af9a99d10c46e3f98d79a68833f1e9a 100644
--- a/data/json/SpellDefinition/13913.json
+++ b/data/json/SpellDefinition/13913.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 13913,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/13927.json b/data/json/SpellDefinition/13927.json
index 26df60a2f6d7eeb43787c6a527e7e62dbde12ae4..4ee36ee2265d9aff72c0af4946372b2e137248ea 100644
--- a/data/json/SpellDefinition/13927.json
+++ b/data/json/SpellDefinition/13927.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 13927,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/140.json b/data/json/SpellDefinition/140.json
index 13f519e10cdefd13e7f223cbe7195ef063bc858b..42020a3e4500a6619de1a2ab3f71935b94564c67 100644
--- a/data/json/SpellDefinition/140.json
+++ b/data/json/SpellDefinition/140.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 140,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/141.json b/data/json/SpellDefinition/141.json
index 29541ef45e4bb845ee4ae6289be2b94c610b2554..41d04303dba4000afa3b7c959b06a1c9d2042a51 100644
--- a/data/json/SpellDefinition/141.json
+++ b/data/json/SpellDefinition/141.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 141,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/142.json b/data/json/SpellDefinition/142.json
index b71921d5a58d4369b892158b6ffb246514da3057..ee1029e775a0eee1ad06b90a94c0bae90bddcd1e 100644
--- a/data/json/SpellDefinition/142.json
+++ b/data/json/SpellDefinition/142.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 142,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/143.json b/data/json/SpellDefinition/143.json
index 07846a3f97be7ab7a7eca58a00b6e49768d49662..6a39e742af288aef676d9fc3d077af43d650d8c9 100644
--- a/data/json/SpellDefinition/143.json
+++ b/data/json/SpellDefinition/143.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 143,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/144.json b/data/json/SpellDefinition/144.json
index 3611e28c326e0d5a5320c139315a60b61d8ee0b0..b3a7adc0189f81a8d36aab4c02e86ad0e9fdbfe6 100644
--- a/data/json/SpellDefinition/144.json
+++ b/data/json/SpellDefinition/144.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 144,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/145.json b/data/json/SpellDefinition/145.json
index ea8257962ff693212c56bfc7132ed4875cd4d34e..48fd369412d141b0cce7e29948b9c30350ccd1d3 100644
--- a/data/json/SpellDefinition/145.json
+++ b/data/json/SpellDefinition/145.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 145,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/14583.json b/data/json/SpellDefinition/14583.json
index 163f9fddb874207e349fd80a56500eede388d483..6d76ad36e845b94482413e605ac09e37bae01c68 100644
--- a/data/json/SpellDefinition/14583.json
+++ b/data/json/SpellDefinition/14583.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 14583,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/146.json b/data/json/SpellDefinition/146.json
index 7b9658a4fe9e022822030d4418985943099e321c..6a6958e5ba9c273d0f331e8338ecd49e958b0431 100644
--- a/data/json/SpellDefinition/146.json
+++ b/data/json/SpellDefinition/146.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 146,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         1
       ]
diff --git a/data/json/SpellDefinition/147.json b/data/json/SpellDefinition/147.json
index 3724973635096e0a93d7c8cd76bc9a29bca42fc3..3e5d5bf3299861888b578da7ff5093fd3a32883e 100644
--- a/data/json/SpellDefinition/147.json
+++ b/data/json/SpellDefinition/147.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 147,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/150.json b/data/json/SpellDefinition/150.json
index 8295c2e9bf1118f7bacdeeb78f21da2ac3561668..61ac622aa3ee3276e0a940f61c840181e2eb9b80 100644
--- a/data/json/SpellDefinition/150.json
+++ b/data/json/SpellDefinition/150.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 150,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 10
+          "value": 8
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "ENIRIPSA - Petite Fiole de Frayeur",
diff --git a/data/json/SpellDefinition/152.json b/data/json/SpellDefinition/152.json
index 150dce0524e5646c854db23497e2381ac0660f7a..08cd32ddf56981d07d526aee7aee5a6d8f62a6c4 100644
--- a/data/json/SpellDefinition/152.json
+++ b/data/json/SpellDefinition/152.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 152,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/153.json b/data/json/SpellDefinition/153.json
index b6fa45a9994ac2ab30c8b8d4941cde1076c640b7..880a89db86582eef4f022e06d83b69c14b8c6199 100644
--- a/data/json/SpellDefinition/153.json
+++ b/data/json/SpellDefinition/153.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 153,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": false,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/154.json b/data/json/SpellDefinition/154.json
index c5fe1d4153479deb491e7382eb8fa6ae24e9aa92..84d63ec2b0040ff01d6114eb072fe3b171e4949b 100644
--- a/data/json/SpellDefinition/154.json
+++ b/data/json/SpellDefinition/154.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 154,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -44,21 +45,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 26.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 32.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/155.json b/data/json/SpellDefinition/155.json
index c05f9c3ed07c06a746ca7867126695c16a5eb084..090bc6a8e1ffda3470a3afdc94cb026d029f12a9 100644
--- a/data/json/SpellDefinition/155.json
+++ b/data/json/SpellDefinition/155.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 155,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         7
       ]
@@ -24,6 +25,16 @@
         }
       }
     ],
+    "castCondition": {
+      "type": "UniqueForCasterTeamCondition",
+      "specificEntity": {
+        "type": "SummoningDefinitionFilter",
+        "condition": 1,
+        "summonings": [
+          825
+        ]
+      }
+    },
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
diff --git a/data/json/SpellDefinition/15586.json b/data/json/SpellDefinition/15586.json
index ecf1a98ef3c7c05d3ffdadb7695d238fd522ba34..80cfecb9ba12b21175122680e61aba0d5fa56c91 100644
--- a/data/json/SpellDefinition/15586.json
+++ b/data/json/SpellDefinition/15586.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 15586,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -69,21 +70,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 9.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 11.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/156.json b/data/json/SpellDefinition/156.json
index 1cf5ec7390626b73dc9304c8913cdaf353de4045..c712b6177a7b399d8b70e80aea31a55ffeca9483 100644
--- a/data/json/SpellDefinition/156.json
+++ b/data/json/SpellDefinition/156.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 156,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/158.json b/data/json/SpellDefinition/158.json
index a71c9405ae5b0a109d19aa281adc938aba859d18..6209c648da847d81d8a993f5bde9dd2e8ed4bccc 100644
--- a/data/json/SpellDefinition/158.json
+++ b/data/json/SpellDefinition/158.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 158,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/15892.json b/data/json/SpellDefinition/15892.json
index 277625fc8c5b5dea833265002d678d79a4f0f943..5973e2f30f5e22c37a07c0f532af788b11f846c3 100644
--- a/data/json/SpellDefinition/15892.json
+++ b/data/json/SpellDefinition/15892.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 15892,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/159.json b/data/json/SpellDefinition/159.json
index 124b547b325ffa7cb787d04e2141c9ff72bcc7db..69cf64a43be4b0d1ad91557abc48fb09ff8a8ce9 100644
--- a/data/json/SpellDefinition/159.json
+++ b/data/json/SpellDefinition/159.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 159,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/161.json b/data/json/SpellDefinition/161.json
index 61c6f5f57e81eb8ff978edf5f0c83545665f9c6e..86669e647083d325613b02ca011ceb95735914ad 100644
--- a/data/json/SpellDefinition/161.json
+++ b/data/json/SpellDefinition/161.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 161,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/162.json b/data/json/SpellDefinition/162.json
index 800d85ce21a1d3113fa4213a8d9287ec60125693..92bee838a002d0499ac82f9358a8f2766dd9ebec 100644
--- a/data/json/SpellDefinition/162.json
+++ b/data/json/SpellDefinition/162.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 162,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/163.json b/data/json/SpellDefinition/163.json
index abd62f599425458fdeb90b3ecb252a647d86ae99..b1fc621eb629a10d0e2a2f3f9ff5f006a34c3c32 100644
--- a/data/json/SpellDefinition/163.json
+++ b/data/json/SpellDefinition/163.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 163,
+    "merchantCosts": [],
     "tags": [
       10
     ],
@@ -12,7 +13,8 @@
       "element": 4,
       "equipable": true,
       "families": [
-        7
+        7,
+        20
       ]
     },
     "gaugeToModifyOnSpellPlay": [
@@ -100,6 +102,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "MECHANISM",
         {
           "type": 7,
diff --git a/data/json/SpellDefinition/16301.json b/data/json/SpellDefinition/16301.json
index f36b8dd14168d6921e87e3808dcfe148fa794c19..e4df4425555ed09353ec4651296aaccf09718ebb 100644
--- a/data/json/SpellDefinition/16301.json
+++ b/data/json/SpellDefinition/16301.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 16301,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -92,21 +93,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v",
           "baseValue": 13.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 13.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/164.json b/data/json/SpellDefinition/164.json
index 024d1830404321b76156cdcb8151f694e2c75cee..e10b0a496a3de9d3d8f6c5a0b81b9a97e625c1b9 100644
--- a/data/json/SpellDefinition/164.json
+++ b/data/json/SpellDefinition/164.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 164,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/166.json b/data/json/SpellDefinition/166.json
index 94c530ef4bca2217c1470b1a8f0d396dbd770e07..ddee574c443f31a1316c052ad91ba01ea5bda2e2 100644
--- a/data/json/SpellDefinition/166.json
+++ b/data/json/SpellDefinition/166.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 166,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,12 +55,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 22.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -71,6 +72,7 @@
       "hasEffects": true,
       "keywordReferences": [
         "ADJACENT",
+        "PUSH",
         "EXPLOSION"
       ]
     }
diff --git a/data/json/SpellDefinition/167.json b/data/json/SpellDefinition/167.json
index 45fc815bb6264076420c03e887d8b5f8730244fc..31dd590633062ab7a716787765ce0e5367523883 100644
--- a/data/json/SpellDefinition/167.json
+++ b/data/json/SpellDefinition/167.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 167,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,31 +54,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 16.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 9.3,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 50
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/168.json b/data/json/SpellDefinition/168.json
index 4bb546941f2a07e76043eadf730703b87b5cbc63..3db50ce5314566b39bc74f60ff390c47e876e20c 100644
--- a/data/json/SpellDefinition/168.json
+++ b/data/json/SpellDefinition/168.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 168,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/169.json b/data/json/SpellDefinition/169.json
index c1665a2840410bf3abfbd288204545e0334bad25..c326e9d8ed03d8baf84edf8353ec6024e1e3b5ff 100644
--- a/data/json/SpellDefinition/169.json
+++ b/data/json/SpellDefinition/169.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 169,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/170.json b/data/json/SpellDefinition/170.json
index 7c517a37bcfa9d6f26f108084526ebcdbe077308..6af58cc0ffa426a7f88a3b9bb3d7a1154c86ae75 100644
--- a/data/json/SpellDefinition/170.json
+++ b/data/json/SpellDefinition/170.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 170,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/171.json b/data/json/SpellDefinition/171.json
index 22207667a5e2ea820d6a5bd38324282a8c9ee5d1..9427118d3fa7d3b36561be0c9b85c5492e815cf5 100644
--- a/data/json/SpellDefinition/171.json
+++ b/data/json/SpellDefinition/171.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 171,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/172.json b/data/json/SpellDefinition/172.json
index 6b108544a3efdba7af4a6aa43e3b601144e4ea2d..7926d9a759eaf74a4672b66579e8abbf2eff6b31 100644
--- a/data/json/SpellDefinition/172.json
+++ b/data/json/SpellDefinition/172.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 172,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/173.json b/data/json/SpellDefinition/173.json
index a3a9393be94bbda672ae10d6423ba162f884c1e6..a8e813921d3291134b2a66baac02e47f358db12a 100644
--- a/data/json/SpellDefinition/173.json
+++ b/data/json/SpellDefinition/173.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 173,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/176.json b/data/json/SpellDefinition/176.json
index fe86c3c599f3d7b57fe121c8dd33b61e09987b9e..ed6b81267f13a1d9ddf8bf2a2c14f7e1b38ab99f 100644
--- a/data/json/SpellDefinition/176.json
+++ b/data/json/SpellDefinition/176.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 176,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/177.json b/data/json/SpellDefinition/177.json
index 143224d527ff5a95d59a9e82f82b1551f70f14b1..516b3c8329053d1be0563c1d33f5dfabaff65afc 100644
--- a/data/json/SpellDefinition/177.json
+++ b/data/json/SpellDefinition/177.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 177,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/178.json b/data/json/SpellDefinition/178.json
index d40d2f6985e79f321c68012131da5fb527628205..d794cbf9f8a92f5ab512d6813b6f172c8c23b075 100644
--- a/data/json/SpellDefinition/178.json
+++ b/data/json/SpellDefinition/178.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 178,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -75,21 +76,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 20.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/18.json b/data/json/SpellDefinition/18.json
index a7db59c39f333dd166bd624b8ca2299d7f613044..d53bd012e6568e04f4e209402cdba573d3d1e826 100644
--- a/data/json/SpellDefinition/18.json
+++ b/data/json/SpellDefinition/18.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 18,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/180.json b/data/json/SpellDefinition/180.json
index cb2f886b68ff6066d32a81c9d9f63edc420b7a54..30d817ebed3093929ebd9253069ad3a6be6d2167 100644
--- a/data/json/SpellDefinition/180.json
+++ b/data/json/SpellDefinition/180.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 180,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/181.json b/data/json/SpellDefinition/181.json
index f32ff4486059b6508090d8fb8c95538843e354dc..2f18cab5970a52227be9b25a10f164b95e4ba7a8 100644
--- a/data/json/SpellDefinition/181.json
+++ b/data/json/SpellDefinition/181.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 181,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/182.json b/data/json/SpellDefinition/182.json
index 6562ea52b133a38b548c499a7a4245a1be21589f..2b2b2307d2d062c28563871581d7a92e727f23f0 100644
--- a/data/json/SpellDefinition/182.json
+++ b/data/json/SpellDefinition/182.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 182,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,21 +55,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 26.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/183.json b/data/json/SpellDefinition/183.json
index 9d5f9d9f4e6c4c8d9b019a1f817958aca5d7585a..9135760433c055762fd64c4801d6090369d58af6 100644
--- a/data/json/SpellDefinition/183.json
+++ b/data/json/SpellDefinition/183.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 183,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -68,12 +69,12 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 11
+          "value": 10
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "mult",
-          "value": 9
+          "value": 10
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/186.json b/data/json/SpellDefinition/186.json
index 098e0a71672cd8ede4706af4cfe3abb2d7c59ada..546ce936bc9dd48b983768e1d0c9ce86c48b09f1 100644
--- a/data/json/SpellDefinition/186.json
+++ b/data/json/SpellDefinition/186.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 186,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/187.json b/data/json/SpellDefinition/187.json
index 8ed04758fc52bc2c6446c50864b19c79866de149..7ee45697274c428d2385b7ab2574ddee4c90368a 100644
--- a/data/json/SpellDefinition/187.json
+++ b/data/json/SpellDefinition/187.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 187,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/19.json b/data/json/SpellDefinition/19.json
index e4c65a16939f9d5b813bca5bdda8a414b69a615b..020ef43ee087e23f1cbc4f7ff1b8b017123e747f 100644
--- a/data/json/SpellDefinition/19.json
+++ b/data/json/SpellDefinition/19.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 19,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/190.json b/data/json/SpellDefinition/190.json
index 004a60c515d7ff5ca5cf9d258ef4e9f8a2bf19b9..e9aae0ef337006469db81957bd26c6bb1f55675f 100644
--- a/data/json/SpellDefinition/190.json
+++ b/data/json/SpellDefinition/190.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 190,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,30 +44,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 6.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 7.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "AR",
           "baseValue": 4.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/1907.json b/data/json/SpellDefinition/1907.json
index 22162da64fada4862aa27cfdfdd4ed46aaeadfb4..16381b9e199dfacfc2544ca9b3a256530fca47da 100644
--- a/data/json/SpellDefinition/1907.json
+++ b/data/json/SpellDefinition/1907.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 1907,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/191.json b/data/json/SpellDefinition/191.json
index 065695aa8d005bb0432574eb1a60f41c487d2a21..1a95b0203e402a4ef607d657e0eca42c49a7e8f0 100644
--- a/data/json/SpellDefinition/191.json
+++ b/data/json/SpellDefinition/191.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 191,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        0
+        0,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/192.json b/data/json/SpellDefinition/192.json
index dc380cd9095ad87eab8b1cde7361d666d0de4576..f841f4059aaa35bb2c88657eaeb110a6984009aa 100644
--- a/data/json/SpellDefinition/192.json
+++ b/data/json/SpellDefinition/192.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 192,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/194.json b/data/json/SpellDefinition/194.json
index 306d79d395f9ffcf8a3d5233bf78b7d41dbcf303..31ea4b26cd963c465339534c813f6e1863d862b7 100644
--- a/data/json/SpellDefinition/194.json
+++ b/data/json/SpellDefinition/194.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 194,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/19485.json b/data/json/SpellDefinition/19485.json
index c333c5e85dae7858124644f7c12047fd215b0d7b..3bc32f817b0590f58b6588734fcff92eff7d5a4f 100644
--- a/data/json/SpellDefinition/19485.json
+++ b/data/json/SpellDefinition/19485.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 19485,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/196.json b/data/json/SpellDefinition/196.json
index 42aa6dfb69dc78bdf50755f0f82b518c3811c9fe..25963fdf8f46176c7cd37eafa026cc2daaf3f845 100644
--- a/data/json/SpellDefinition/196.json
+++ b/data/json/SpellDefinition/196.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 196,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/19694.json b/data/json/SpellDefinition/19694.json
index 1b9810b07b1ab55da7482a7912ea06eecd3a3011..1b945bb62de9838637d0749ecf812ae42e08d9ae 100644
--- a/data/json/SpellDefinition/19694.json
+++ b/data/json/SpellDefinition/19694.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 19694,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/197.json b/data/json/SpellDefinition/197.json
index 2a2c0c9324edb5e5e3d5126aec5dabc0696ead22..7ad075a5b000c645ec926fe35865ff637a441694 100644
--- a/data/json/SpellDefinition/197.json
+++ b/data/json/SpellDefinition/197.json
@@ -4,12 +4,21 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 197,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
-      "families": []
+      "equipable": true,
+      "families": [
+        73
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/2.json b/data/json/SpellDefinition/2.json
index 36c768073d0c3bddb5c94b6fb0ce8ecb4fbf1146..44c222bf9debdf6bacb98c4a0c9731a73552206f 100644
--- a/data/json/SpellDefinition/2.json
+++ b/data/json/SpellDefinition/2.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 2,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/20.json b/data/json/SpellDefinition/20.json
index 5fd40d36a6aeab14e21b6056039b32a815685be4..3b9d64ae23391a28cff38ae85cc780f13d74a794 100644
--- a/data/json/SpellDefinition/20.json
+++ b/data/json/SpellDefinition/20.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 20,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/201.json b/data/json/SpellDefinition/201.json
index c1b7d4814089daf85588690e1f90c1983cc4669f..71d605bfeb71872ddba5618252f05d4069ae79fd 100644
--- a/data/json/SpellDefinition/201.json
+++ b/data/json/SpellDefinition/201.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 201,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -51,21 +52,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 13.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/20122.json b/data/json/SpellDefinition/20122.json
index 043848037969b986ab6bdecd69476b1a0306743c..918ca685d49f34e1c07d6673e5e2057b0a2ec727 100644
--- a/data/json/SpellDefinition/20122.json
+++ b/data/json/SpellDefinition/20122.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 20122,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/20205.json b/data/json/SpellDefinition/20205.json
index 0f3881713e1ff2784671b4de83a46b44ea94c92d..e89dd0249edae9105d6f6458cb951840003d68be 100644
--- a/data/json/SpellDefinition/20205.json
+++ b/data/json/SpellDefinition/20205.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 20205,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -57,12 +58,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 10.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/203.json b/data/json/SpellDefinition/203.json
index 478ec7bbee5f9d38b32729a8837b0bb0e18e68bf..ca7bc44be0299248a3f75aad61ce82734923b107 100644
--- a/data/json/SpellDefinition/203.json
+++ b/data/json/SpellDefinition/203.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 203,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/2035.json b/data/json/SpellDefinition/2035.json
index ebd280be15622ccbac9d32f7bd8301deb8652676..9e760886789923d86ae5843e9f98c5e2ae8ccf0d 100644
--- a/data/json/SpellDefinition/2035.json
+++ b/data/json/SpellDefinition/2035.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 2035,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/204.json b/data/json/SpellDefinition/204.json
index 996aacc809fe3552ede8a47532e45b7c06aadcb7..1fb25e6d802511610e10f7b62ccc645cded59c28 100644
--- a/data/json/SpellDefinition/204.json
+++ b/data/json/SpellDefinition/204.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 204,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,7 +53,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 27.0,
           "factor": {
@@ -61,7 +62,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 33.0,
           "factor": {
diff --git a/data/json/SpellDefinition/205.json b/data/json/SpellDefinition/205.json
index 0c6c8afff41f31a8ce41a0a507ac72ec998941fc..db3075ba1ee2c910998cadd8060c2bb5b27b1693 100644
--- a/data/json/SpellDefinition/205.json
+++ b/data/json/SpellDefinition/205.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 205,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 4.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 4.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/206.json b/data/json/SpellDefinition/206.json
index fa33693a2f1953201cf3a03e3cb4d1bf6391e6ee..389220a9ef568237c86b87d70d20d5de0c461b2e 100644
--- a/data/json/SpellDefinition/206.json
+++ b/data/json/SpellDefinition/206.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 206,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/207.json b/data/json/SpellDefinition/207.json
index 0a544b274a844aa943a938cd0be23b2e7f8c46d6..b9c13a73599a2db2c0250bb875f50712aa9c899a 100644
--- a/data/json/SpellDefinition/207.json
+++ b/data/json/SpellDefinition/207.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 207,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/208.json b/data/json/SpellDefinition/208.json
index 745d0b54510b5e570797bb3cfc54597aa8221592..8de35edbd979018a0ae0eb1e0ad9de43e28564f1 100644
--- a/data/json/SpellDefinition/208.json
+++ b/data/json/SpellDefinition/208.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 208,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmgmax",
           "baseValue": 14.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmgmin",
           "baseValue": 6.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/209.json b/data/json/SpellDefinition/209.json
index 15dc6fbacf9cc1140021acfc8cf2fa00bef9f42f..dab77dcf5adca9cdd7a54f33a28126dab504595b 100644
--- a/data/json/SpellDefinition/209.json
+++ b/data/json/SpellDefinition/209.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 209,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/21.json b/data/json/SpellDefinition/21.json
index 58b5d3c6813e59a98322df933605c521de1e7441..c61aede936d630203af39bfbd8fe7d7c98f862ab 100644
--- a/data/json/SpellDefinition/21.json
+++ b/data/json/SpellDefinition/21.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 21,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/210.json b/data/json/SpellDefinition/210.json
index 81e0db7f43d797a2e6cd41fc0058337eecd6e442..b7b3530cb37bd384d8632af5b0f65fce4084ddbe 100644
--- a/data/json/SpellDefinition/210.json
+++ b/data/json/SpellDefinition/210.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 210,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/214.json b/data/json/SpellDefinition/214.json
index e5af2a75bdf8a666c0a4f12ea3ccce482ee0567a..82a48c34cf229a6f6ac7fd6889087bd9afa85b80 100644
--- a/data/json/SpellDefinition/214.json
+++ b/data/json/SpellDefinition/214.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 214,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/216.json b/data/json/SpellDefinition/216.json
index 5275b0a82a79deae8baf97b416d7730f47ca7f08..d984535a9c61e653d58d82ddf9d8c5b85cea8cd2 100644
--- a/data/json/SpellDefinition/216.json
+++ b/data/json/SpellDefinition/216.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 216,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/217.json b/data/json/SpellDefinition/217.json
index 46d8d0d3d53136688a6b20dfd764bc4dff45c445..ee3d9105998747fe258e70e056d0a53a430c3a7a 100644
--- a/data/json/SpellDefinition/217.json
+++ b/data/json/SpellDefinition/217.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 217,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": true,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
@@ -114,7 +116,7 @@
     "spellEffectData": [
       {
         "type": "SpellEffectInstantiationData",
-        "spellEffect": "3ad96f6b81602894390cd76392e45a74",
+        "spellEffect": "3591737aeafa8654ba783ccd5a076402",
         "originTarget": {
           "type": "CasterHeroSelector"
         },
diff --git a/data/json/SpellDefinition/219.json b/data/json/SpellDefinition/219.json
index c02e7ea14f8e9a1496a157f3b357f215b61cd162..a84196cba6723d5bd08faf49e2d64148bb6a012e 100644
--- a/data/json/SpellDefinition/219.json
+++ b/data/json/SpellDefinition/219.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 219,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/220.json b/data/json/SpellDefinition/220.json
index 48d81a2f16e71a140f4cfabfd8bc68bf8f0e7d6e..d76f67e90d7779edd54ec011909d300e21688952 100644
--- a/data/json/SpellDefinition/220.json
+++ b/data/json/SpellDefinition/220.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 220,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 6.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 8.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/221.json b/data/json/SpellDefinition/221.json
index db872093fef0c3beab8548f588cea06a924560c3..aa9dc81137f2454dd4f18952d985208eb56eb871 100644
--- a/data/json/SpellDefinition/221.json
+++ b/data/json/SpellDefinition/221.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 221,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/222.json b/data/json/SpellDefinition/222.json
index ab082eeb7abef40775c0c3abd01068a31d21d987..ca776c9be9db58cc329b6a652c6a2bb12ae1c86d 100644
--- a/data/json/SpellDefinition/222.json
+++ b/data/json/SpellDefinition/222.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 222,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,21 +53,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 6.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 7.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/223.json b/data/json/SpellDefinition/223.json
index 8abf92016dbbcd00869bdadaff2a6d66ea789e9a..67307b506b117ee86cb6fcd41557add28786ace8 100644
--- a/data/json/SpellDefinition/223.json
+++ b/data/json/SpellDefinition/223.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 223,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/226.json b/data/json/SpellDefinition/226.json
index 68e7efca8452d0eb445574b5d73aa89deb945f21..1d0b98f7ae758e350588a3d0ca9a93e747379d85 100644
--- a/data/json/SpellDefinition/226.json
+++ b/data/json/SpellDefinition/226.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 226,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/227.json b/data/json/SpellDefinition/227.json
index 63ededcc605647e3b17ab49bfaa3608dd736f9da..215fcb8891e677ac748e05abc5741d5c5ccadcb2 100644
--- a/data/json/SpellDefinition/227.json
+++ b/data/json/SpellDefinition/227.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 227,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/228.json b/data/json/SpellDefinition/228.json
index 4ef612629b78d3c562aa937f805ad86bf14b3a3f..3c4540376e53b60ec497e06adb23cdecd8cc19e5 100644
--- a/data/json/SpellDefinition/228.json
+++ b/data/json/SpellDefinition/228.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 228,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/229.json b/data/json/SpellDefinition/229.json
index 8787fb01f72df86ede4c10682f8646949b4bfd3c..bd95c1e8ccd1fac15c50ceef0f691bb74aee7e63 100644
--- a/data/json/SpellDefinition/229.json
+++ b/data/json/SpellDefinition/229.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 229,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/23.json b/data/json/SpellDefinition/23.json
index a85808a7d0ed6093e569be8617b86f240fa350d8..52da4d2280775687d2325b45d339566d9b6f2293 100644
--- a/data/json/SpellDefinition/23.json
+++ b/data/json/SpellDefinition/23.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 23,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 25.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/230.json b/data/json/SpellDefinition/230.json
index d6a3070adeb2fa6d18ec1efc6d60a49731d69e53..92bc3649427ad010e9a3a7c97c21155db102deae 100644
--- a/data/json/SpellDefinition/230.json
+++ b/data/json/SpellDefinition/230.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 230,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 15
+          "value": 13
         },
         {
           "type": "ConstIntegerValue",
@@ -131,7 +107,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AFFINITY"
+        "AFFINITY",
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/233.json b/data/json/SpellDefinition/233.json
index 2eb93ba2cfe08b5a7ced8892b9e95b1fe6a84ebf..165c8a228c7fabb3e54c89002c6e852db4666200 100644
--- a/data/json/SpellDefinition/233.json
+++ b/data/json/SpellDefinition/233.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 233,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/23329.json b/data/json/SpellDefinition/23329.json
index ce2b8d2db96040111d1dab6f07aef07d0b58e657..a967feba676e86337cb21679bcd7cf59be12d3f3 100644
--- a/data/json/SpellDefinition/23329.json
+++ b/data/json/SpellDefinition/23329.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 23329,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/23354.json b/data/json/SpellDefinition/23354.json
index 11b6adba185af7862f6edf55ca0cb0ad6f61bc0d..1ac466c8f6b8fd5ad1e937f2ad2da0cdf1e8a07b 100644
--- a/data/json/SpellDefinition/23354.json
+++ b/data/json/SpellDefinition/23354.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 23354,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/234.json b/data/json/SpellDefinition/234.json
index 9fc0099929f6bef4ce5a8d1d4ac84811d8b48af9..b8184686effe66a9c8ed104b3056829823eeb2de 100644
--- a/data/json/SpellDefinition/234.json
+++ b/data/json/SpellDefinition/234.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 234,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/235.json b/data/json/SpellDefinition/235.json
index 585bcfde0c8edcdc57d95fd262d6a7866aff7565..660ad89e99eab793d4e7c2dadc08945a56f2126d 100644
--- a/data/json/SpellDefinition/235.json
+++ b/data/json/SpellDefinition/235.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 235,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/236.json b/data/json/SpellDefinition/236.json
index acac94d21cd689e807b6b003aa3ea39101dee064..610c9896108d0ca16ab1b72e3f542a0bd12e9b57 100644
--- a/data/json/SpellDefinition/236.json
+++ b/data/json/SpellDefinition/236.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 236,
+    "merchantCosts": [],
     "tags": [
       0
     ],
@@ -68,11 +69,12 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 19
+          "value": 16
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "MELEE"
       ]
     }
diff --git a/data/json/SpellDefinition/237.json b/data/json/SpellDefinition/237.json
index 21e5e3dfe5f9e651ea4c7bfd8f953748c9f06286..c80be8471b7c69c399e6b493691b31b4ac3b40c7 100644
--- a/data/json/SpellDefinition/237.json
+++ b/data/json/SpellDefinition/237.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 237,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/239.json b/data/json/SpellDefinition/239.json
index c5e655c9a9b1df4a25e41304a472cb0c26cd5cf3..885c90a039f897c710fe161a14d3ed9503f4b150 100644
--- a/data/json/SpellDefinition/239.json
+++ b/data/json/SpellDefinition/239.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 239,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/24.json b/data/json/SpellDefinition/24.json
index 04e472138d699cfe2e708ee154979816174040fc..a7e5ba16e7eaee31996619ca02857202f48f8d97 100644
--- a/data/json/SpellDefinition/24.json
+++ b/data/json/SpellDefinition/24.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 24,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -81,7 +82,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 12
+          "value": 80
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/SpellDefinition/240.json b/data/json/SpellDefinition/240.json
index d5c5a8a1537cfa789916a86b6343e62faa5262fe..cec1173edd7faf58ccf7e88d1d3104cc4cca5687 100644
--- a/data/json/SpellDefinition/240.json
+++ b/data/json/SpellDefinition/240.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 240,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 14.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/241.json b/data/json/SpellDefinition/241.json
index c97086d7f4071054b79f57d7ebb949d2f9e59e9a..a2fcbd3ab56092422239a30b9131fc0870b6f95f 100644
--- a/data/json/SpellDefinition/241.json
+++ b/data/json/SpellDefinition/241.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 241,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/242.json b/data/json/SpellDefinition/242.json
index 73e427374701108820efeebf419855dda0d77893..8abdb5a87784d2b9c5eebb5c09f9edcfd85fb9ee 100644
--- a/data/json/SpellDefinition/242.json
+++ b/data/json/SpellDefinition/242.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 242,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/243.json b/data/json/SpellDefinition/243.json
index 7d9fa435972d7c1d4c8fb02f8212305552a33261..fda51ec4564d983edae859ffdb095916995ae1ad 100644
--- a/data/json/SpellDefinition/243.json
+++ b/data/json/SpellDefinition/243.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 243,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/244.json b/data/json/SpellDefinition/244.json
index 3178e381081af5a8ab5aaac5c99b4838d7d5a33a..20e655d96d9bbc30fede0966bd81ee37c0e11a22 100644
--- a/data/json/SpellDefinition/244.json
+++ b/data/json/SpellDefinition/244.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 244,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        1
+        1,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/246.json b/data/json/SpellDefinition/246.json
index 017a924e855278cd0e508ac2ced1944d1b8ccc5b..9eb2703414aa411091e871f050cefe056c3703ab 100644
--- a/data/json/SpellDefinition/246.json
+++ b/data/json/SpellDefinition/246.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 246,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/247.json b/data/json/SpellDefinition/247.json
index e56ec22a547aa20bdd001e14d9195fdc89143d88..b3a6b7a3af1b3f673666017c7af38c30431b7cdf 100644
--- a/data/json/SpellDefinition/247.json
+++ b/data/json/SpellDefinition/247.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 247,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/248.json b/data/json/SpellDefinition/248.json
index 5a6dfaeb389ec1ea2cf9b53c909343e74bdd9ae7..20b6f0ad07199a7ef5dd47747577784506192c2c 100644
--- a/data/json/SpellDefinition/248.json
+++ b/data/json/SpellDefinition/248.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 248,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/249.json b/data/json/SpellDefinition/249.json
index f15883c59c5f41fb73e7c273e13db4dbab0577c2..8449e61c3a7b087e689416e672506d20a2967d3b 100644
--- a/data/json/SpellDefinition/249.json
+++ b/data/json/SpellDefinition/249.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 249,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/250.json b/data/json/SpellDefinition/250.json
index f4eeb859a12edd8946ffa2ae92947c493056bad6..af3ef42c704bfe6adba06589168251650da96fbf 100644
--- a/data/json/SpellDefinition/250.json
+++ b/data/json/SpellDefinition/250.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 250,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/2503.json b/data/json/SpellDefinition/2503.json
index 9dad3e5f50bd30139441dae6cfd6edfadf52ae78..4a966824dc8d06b93202c9c5afecc3c8be05dbf8 100644
--- a/data/json/SpellDefinition/2503.json
+++ b/data/json/SpellDefinition/2503.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 2503,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/251.json b/data/json/SpellDefinition/251.json
index 7c9687917c375488532e4afbd395a083147797af..d6b3db3fcb92dce048ba055dcf247bae0ed83664 100644
--- a/data/json/SpellDefinition/251.json
+++ b/data/json/SpellDefinition/251.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 251,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -75,22 +76,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min",
-          "baseValue": 2.5,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "max",
-          "baseValue": 4.1,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 20
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/252.json b/data/json/SpellDefinition/252.json
index b0778ba62799ef808da3a7ec1b1ea7e17e4e49b8..45e99588b4f50ebfff1c782aa589569a0a404301 100644
--- a/data/json/SpellDefinition/252.json
+++ b/data/json/SpellDefinition/252.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 252,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/253.json b/data/json/SpellDefinition/253.json
index fa85ea13463ad02a7fe97dc5176761951586007a..4797ae534424959d9551b68d3fba9e3a70ce3e9a 100644
--- a/data/json/SpellDefinition/253.json
+++ b/data/json/SpellDefinition/253.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 253,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/254.json b/data/json/SpellDefinition/254.json
index 542650da0e96db3c798867df1a1c5ca75cd76733..350b47a62eabe51e93619315ee4a81dabf46e9ca 100644
--- a/data/json/SpellDefinition/254.json
+++ b/data/json/SpellDefinition/254.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 254,
+    "merchantCosts": [],
     "tags": [
       3
     ],
@@ -15,7 +16,17 @@
         2
       ]
     },
-    "gaugeToModifyOnSpellPlay": [],
+    "gaugeToModifyOnSpellPlay": [
+      {
+        "type": "GaugeValue",
+        "element": 57,
+        "value": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1
+        }
+      }
+    ],
     "costs": [
       {
         "type": "ActionPointsCost",
diff --git a/data/json/SpellDefinition/256.json b/data/json/SpellDefinition/256.json
index 3f77e3df75c8e1239dda59b6df51fdbf2ed36203..3dc1ba53d5e427714e24323fe31c241593def621 100644
--- a/data/json/SpellDefinition/256.json
+++ b/data/json/SpellDefinition/256.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 256,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/257.json b/data/json/SpellDefinition/257.json
index de325340b51ea211bb384842cdc5689e1fb73207..680da0706b20a9f023cdcaee4b2f9fc711fb7318 100644
--- a/data/json/SpellDefinition/257.json
+++ b/data/json/SpellDefinition/257.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 257,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/258.json b/data/json/SpellDefinition/258.json
index 15944997590e6e2de01fc51bdedfb67ca4f219ae..3228170109bcb58995f1000a842bbd91d884d673 100644
--- a/data/json/SpellDefinition/258.json
+++ b/data/json/SpellDefinition/258.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 258,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/259.json b/data/json/SpellDefinition/259.json
index 247dc0bf39b8bf60dc6db53339752044cb3657f5..acf888021d7005495e1f23e8ae040d0d86b92412 100644
--- a/data/json/SpellDefinition/259.json
+++ b/data/json/SpellDefinition/259.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 259,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/260.json b/data/json/SpellDefinition/260.json
index af9789f5a50693439638e88e0eb507329a58ef2a..3b394cf78a275b8ef6fa68be33574849458e84af 100644
--- a/data/json/SpellDefinition/260.json
+++ b/data/json/SpellDefinition/260.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 260,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -120,12 +121,12 @@
           "value": 3
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 13.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/261.json b/data/json/SpellDefinition/261.json
index d316aac80be3f1c37e51a0ff1f3a5e04dad2c3b0..7b714f5e2d1af4edd4a1b88a363769467962df56 100644
--- a/data/json/SpellDefinition/261.json
+++ b/data/json/SpellDefinition/261.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 261,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 7.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 8.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/26299.json b/data/json/SpellDefinition/26299.json
index c95c9233c58ec2181e8c98efaf00e8da84718666..f7f0533556b2cf5edf949a8075dddd5b4ac79195 100644
--- a/data/json/SpellDefinition/26299.json
+++ b/data/json/SpellDefinition/26299.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 26299,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -71,7 +72,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 6
+          "value": 25
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/SpellDefinition/264.json b/data/json/SpellDefinition/264.json
index 5651202011b937cb9208cc96d578e9ec5d3cfe11..198246f91f845337c8d8067d188f15adc42afc8e 100644
--- a/data/json/SpellDefinition/264.json
+++ b/data/json/SpellDefinition/264.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 264,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -69,30 +70,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 16.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 19.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -103,7 +95,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "COLLISION"
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/26465.json b/data/json/SpellDefinition/26465.json
index 86e91d9e27db7380bde694106072e4969af2c38f..267bbd2ed08993741dba89c8ceb1036f69acb7ce 100644
--- a/data/json/SpellDefinition/26465.json
+++ b/data/json/SpellDefinition/26465.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 26465,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -112,21 +113,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 29.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 36.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/265.json b/data/json/SpellDefinition/265.json
index a1e06def9e1b37dc825b270c0d2fc21cc34aff68..f59ecb4cecb303be7a8657c7036e014ec93fca25 100644
--- a/data/json/SpellDefinition/265.json
+++ b/data/json/SpellDefinition/265.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 265,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/266.json b/data/json/SpellDefinition/266.json
index 73859bffa414ed8d5fcacbc600a78a5180c40b26..dcbb1f231071374a88c159552d45517f1154e308 100644
--- a/data/json/SpellDefinition/266.json
+++ b/data/json/SpellDefinition/266.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 266,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/267.json b/data/json/SpellDefinition/267.json
index 09d35ef796214fd73b0103a47905d40c66d6768b..0e86eb7e498539d09f745ec595bc51b438eb0c03 100644
--- a/data/json/SpellDefinition/267.json
+++ b/data/json/SpellDefinition/267.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 267,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 22
+          "value": 20
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "OSAMODAS - Corbonade",
diff --git a/data/json/SpellDefinition/268.json b/data/json/SpellDefinition/268.json
index 0a57d9b0a7965d8f7bf2b0300951db2ca64c0261..e8cd1bb77a04005de5686b587c87c10e491bcc1f 100644
--- a/data/json/SpellDefinition/268.json
+++ b/data/json/SpellDefinition/268.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 268,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/271.json b/data/json/SpellDefinition/271.json
index 56525ca80c8c3aa41688428d03549c5e44e6aca3..12b7b4cf430d5a6c5012b211bf571470cba71a6b 100644
--- a/data/json/SpellDefinition/271.json
+++ b/data/json/SpellDefinition/271.json
@@ -4,13 +4,14 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 271,
+    "merchantCosts": [],
     "tags": [
       0
     ],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         1
       ]
diff --git a/data/json/SpellDefinition/272.json b/data/json/SpellDefinition/272.json
index e90a5fab0dbecb1b1df00aa89948b5baae92ca05..82dea6d3005c7993f0312cd70124b1f3e02bf796 100644
--- a/data/json/SpellDefinition/272.json
+++ b/data/json/SpellDefinition/272.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 272,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/27210.json b/data/json/SpellDefinition/27210.json
index 25cb43d5464c7aa2de483daea49835b0777b5ed8..da63392248b7716337d32bbecbc6cb8b037be91f 100644
--- a/data/json/SpellDefinition/27210.json
+++ b/data/json/SpellDefinition/27210.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 27210,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/273.json b/data/json/SpellDefinition/273.json
index 9bb862f43924878a4c8d03eb57e650c15dcb1e57..c300f15f4330fc07e67d09c0e22cf856966fc9c6 100644
--- a/data/json/SpellDefinition/273.json
+++ b/data/json/SpellDefinition/273.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 273,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
@@ -20,7 +27,7 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 3
+          "value": 2
         }
       }
     ],
@@ -30,17 +37,48 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 20
+          "value": 6
         }
       }
     ],
     "castCondition": {
-      "type": "UniqueForCasterTeamCondition",
-      "specificEntity": {
-        "type": "SummoningDefinitionFilter",
-        "condition": 1,
-        "summonings": []
-      }
+      "type": "AndCastCondition",
+      "conditions": [
+        {
+          "type": "UniqueForCasterTeamCondition",
+          "specificEntity": {
+            "type": "SummoningDefinitionFilter",
+            "condition": 1,
+            "summonings": [
+              29
+            ]
+          }
+        },
+        {
+          "type": "ConditionalCastCondition",
+          "condition": {
+            "type": "CaracValueCondition",
+            "selector": {
+              "type": "CasterSelector"
+            },
+            "carac": 21,
+            "value": {
+              "type": "GreaterEqualThan",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "valueStasis",
+                "value": 15
+              }
+            }
+          },
+          "ifTrue": {
+            "type": "SuccessCastCondition"
+          },
+          "ifFalse": {
+            "type": "FailureCastCondition"
+          }
+        }
+      ]
     },
     "castTarget": {
       "type": "OneCastTargetDefinition",
@@ -57,7 +95,7 @@
               "minIncluded": {
                 "type": "ConstIntegerValue",
                 "referenceId": "",
-                "value": 2
+                "value": 1
               },
               "maxIncluded": {
                 "type": "ConstIntegerValue",
@@ -90,6 +128,11 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "valueStasis",
+          "value": 15
+        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
diff --git a/data/json/SpellDefinition/276.json b/data/json/SpellDefinition/276.json
index a4884564eb26289a85c6c9928d35a6f73173c623..1eaa0b8e4ae03fc2f27fed2c8087193a104d8ecd 100644
--- a/data/json/SpellDefinition/276.json
+++ b/data/json/SpellDefinition/276.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 276,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/277.json b/data/json/SpellDefinition/277.json
index 11ef6e346cb2e8f6618f422164e6ff862cf4e321..b31ca2eb2357e59dff1d24a2c55b6461d4590a0b 100644
--- a/data/json/SpellDefinition/277.json
+++ b/data/json/SpellDefinition/277.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 277,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -70,7 +71,13 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "s",
+          "value": 2
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "SIGHT"
diff --git a/data/json/SpellDefinition/278.json b/data/json/SpellDefinition/278.json
index ffb2d8f26d4822edee0988a9c2879265ea3eb5ab..0d3214ecd08e9f174cb7b5a810f84b666f5cfab0 100644
--- a/data/json/SpellDefinition/278.json
+++ b/data/json/SpellDefinition/278.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 278,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -34,6 +35,16 @@
         }
       }
     ],
+    "castCondition": {
+      "type": "UniqueForCasterTeamCondition",
+      "specificEntity": {
+        "type": "SummoningDefinitionFilter",
+        "condition": 1,
+        "summonings": [
+          644
+        ]
+      }
+    },
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
@@ -59,7 +70,15 @@
         ]
       }
     },
-    "spellEffectData": [],
+    "spellEffectData": [
+      {
+        "type": "SpellEffectInstantiationData",
+        "spellEffect": "0d9700b5de820314f8d2e3ddf4fdbb9d",
+        "originTarget": {
+          "type": "FirstCastTargetSelector"
+        }
+      }
+    ],
     "eventsInvalidatingCost": [
       2
     ],
@@ -84,15 +103,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
-        "DEATHBLOW",
+        "SHADOW",
+        "UNIQUE",
         {
           "type": 4,
           "id": 644
diff --git a/data/json/SpellDefinition/279.json b/data/json/SpellDefinition/279.json
index 5368f20012aead3d7bab98f32b80c26f258e4150..cfc110f1efc61aa16b86b9a964a766d32623e94a 100644
--- a/data/json/SpellDefinition/279.json
+++ b/data/json/SpellDefinition/279.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 279,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/281.json b/data/json/SpellDefinition/281.json
index a4f0a59d4f9dce229cf45b2151bf376f15c3627e..805c21c6d4ffc38c52bd197d4ac8159e72202289 100644
--- a/data/json/SpellDefinition/281.json
+++ b/data/json/SpellDefinition/281.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 281,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -60,21 +61,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 12.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/282.json b/data/json/SpellDefinition/282.json
index 820a78fe86d43f1f4320e1910e0db3264825df48..6f1d143980d325c29d84e3d8767d40e7096da3e9 100644
--- a/data/json/SpellDefinition/282.json
+++ b/data/json/SpellDefinition/282.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 282,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/283.json b/data/json/SpellDefinition/283.json
index 364e30bae72bd02d8aa7201d3febf878990e2446..1827a5c0e0639726f6bb78a13480a19396252831 100644
--- a/data/json/SpellDefinition/283.json
+++ b/data/json/SpellDefinition/283.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 283,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/284.json b/data/json/SpellDefinition/284.json
index 321056c3bb5c454bca2749c7aad4b54c46c68e22..dbc3ff956c753ed4d8d3901c7bfdcbdb71f70601 100644
--- a/data/json/SpellDefinition/284.json
+++ b/data/json/SpellDefinition/284.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 284,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 20.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/285.json b/data/json/SpellDefinition/285.json
index 244a61578aaffdadcfe772534149d17fcd67fd86..c0be605ce5b9a739eae3e463d07e2d7cd3f4a84d 100644
--- a/data/json/SpellDefinition/285.json
+++ b/data/json/SpellDefinition/285.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 285,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -34,6 +35,16 @@
         }
       }
     ],
+    "castCondition": {
+      "type": "UniqueForCasterTeamCondition",
+      "specificEntity": {
+        "type": "SummoningDefinitionFilter",
+        "condition": 1,
+        "summonings": [
+          350
+        ]
+      }
+    },
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
@@ -59,7 +70,15 @@
         ]
       }
     },
-    "spellEffectData": [],
+    "spellEffectData": [
+      {
+        "type": "SpellEffectInstantiationData",
+        "spellEffect": "0d9700b5de820314f8d2e3ddf4fdbb9d",
+        "originTarget": {
+          "type": "FirstCastTargetSelector"
+        }
+      }
+    ],
     "eventsInvalidatingCost": [
       2
     ],
@@ -85,6 +104,7 @@
       "hasEffects": true,
       "keywordReferences": [
         "METEOR",
+        "UNIQUE",
         {
           "type": 4,
           "id": 350
diff --git a/data/json/SpellDefinition/287.json b/data/json/SpellDefinition/287.json
index 5f3a34e4f5f0bf1d44bb4435248413748bcf3998..5128b8a94f4013a612c3037bdc8fcbbc8358ceb8 100644
--- a/data/json/SpellDefinition/287.json
+++ b/data/json/SpellDefinition/287.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 287,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/289.json b/data/json/SpellDefinition/289.json
index 011b4687221375a49e7eda4a640b466fc1ad82d2..cc5aff68216b541e6406b2c7a5e3509b669c7835 100644
--- a/data/json/SpellDefinition/289.json
+++ b/data/json/SpellDefinition/289.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 289,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/290.json b/data/json/SpellDefinition/290.json
index b6d9d088a9528ae37d504ab80972ab5c8fd2a0da..d165eac049978eb422ea51c3399729200636441e 100644
--- a/data/json/SpellDefinition/290.json
+++ b/data/json/SpellDefinition/290.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 290,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/291.json b/data/json/SpellDefinition/291.json
index 5f11275e134bba8f830a874ba70bb7fe396ae5f4..92fe8f8e5ae0ac1cf9a1da3b2345dac0a9f4bcfd 100644
--- a/data/json/SpellDefinition/291.json
+++ b/data/json/SpellDefinition/291.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 291,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/292.json b/data/json/SpellDefinition/292.json
index e9c28cdacacb74161be090b2740ae182792ab8c4..9cc7eb1e34fde26871b182626fdeed979542b88a 100644
--- a/data/json/SpellDefinition/292.json
+++ b/data/json/SpellDefinition/292.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 292,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/293.json b/data/json/SpellDefinition/293.json
index 44fae77dccdbbdb3b799e17f88789cdfd5dea94b..84af5a44b3deb51f31a249e1e3c1d8c056f38fbc 100644
--- a/data/json/SpellDefinition/293.json
+++ b/data/json/SpellDefinition/293.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 293,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/294.json b/data/json/SpellDefinition/294.json
index 6351a8c121dacead5dd89b6be39a19c975f78a87..8efe30d997b5b9ca98923bbcd87556e8ee53af99 100644
--- a/data/json/SpellDefinition/294.json
+++ b/data/json/SpellDefinition/294.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 294,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/29473.json b/data/json/SpellDefinition/29473.json
index 36b710d2616525bf5f956284de111d416b5518c2..8ddb675e028c24f8c4e02f84455de7f5e69eccf8 100644
--- a/data/json/SpellDefinition/29473.json
+++ b/data/json/SpellDefinition/29473.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 29473,
+    "merchantCosts": [],
     "tags": [
       7
     ],
diff --git a/data/json/SpellDefinition/295.json b/data/json/SpellDefinition/295.json
index af30d52a04fc3f7f51a45e511cdfdbf95511dff6..f30649c9c325a7218d0152d9f12c2d50f33baacc 100644
--- a/data/json/SpellDefinition/295.json
+++ b/data/json/SpellDefinition/295.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 295,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/29601.json b/data/json/SpellDefinition/29601.json
index 4e8afb3c28a8aac10517d9a27313ea4a34860ffe..74a1fe6849f9df4fea01b2ee71b7fcc827a427c1 100644
--- a/data/json/SpellDefinition/29601.json
+++ b/data/json/SpellDefinition/29601.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 29601,
+    "merchantCosts": [],
     "tags": [
       7
     ],
diff --git a/data/json/SpellDefinition/29706.json b/data/json/SpellDefinition/29706.json
index 8b265794b0a157401a9e2a53be3fab26d0f2a44c..63c372bd64f325d8cb8f9ec38f1348d58fde9e9c 100644
--- a/data/json/SpellDefinition/29706.json
+++ b/data/json/SpellDefinition/29706.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 29706,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 11.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/29721.json b/data/json/SpellDefinition/29721.json
index 6852bb4a72a144fc0658adee138120ebad116a29..91b1d84517689eaa234417f63d94797757084a85 100644
--- a/data/json/SpellDefinition/29721.json
+++ b/data/json/SpellDefinition/29721.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 29721,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/29726.json b/data/json/SpellDefinition/29726.json
index c0719f99dc1f391b0bf5f29b8bc80eefd9e1d374..4b1e75088938d70321f1675f91fc631e71ba50ec 100644
--- a/data/json/SpellDefinition/29726.json
+++ b/data/json/SpellDefinition/29726.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 29726,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/29822.json b/data/json/SpellDefinition/29822.json
index ed717a5b8b135b38076101800d06ead9e2c46bf7..a00dac10ae301ae93b459779894803d33e905713 100644
--- a/data/json/SpellDefinition/29822.json
+++ b/data/json/SpellDefinition/29822.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 29822,
+    "merchantCosts": [],
     "tags": [
       7
     ],
diff --git a/data/json/SpellDefinition/3.json b/data/json/SpellDefinition/3.json
index c91252626283625ceab8cf63ae7b01aeefa530b8..433aac25821f0b368e6b6e387a5c8a5206bd6846 100644
--- a/data/json/SpellDefinition/3.json
+++ b/data/json/SpellDefinition/3.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3,
+    "merchantCosts": [],
     "tags": [
       1
     ],
diff --git a/data/json/SpellDefinition/30.json b/data/json/SpellDefinition/30.json
index 650906840d988ad86c0ae83f77247c5396a84f40..481ced7072be0b5549df38392fab230f16b6a742 100644
--- a/data/json/SpellDefinition/30.json
+++ b/data/json/SpellDefinition/30.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/300.json b/data/json/SpellDefinition/300.json
index c15c224edf797b752127f7e7798bfda1952028b8..8485e47964e63fc82fed184e70824791de782463 100644
--- a/data/json/SpellDefinition/300.json
+++ b/data/json/SpellDefinition/300.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 300,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/301.json b/data/json/SpellDefinition/301.json
index f4d64e813933a7f2ec221a28c9fff64319ea96fc..d331b6360c8644acc9cb79da6ee0c29bf4a5f02c 100644
--- a/data/json/SpellDefinition/301.json
+++ b/data/json/SpellDefinition/301.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 301,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/30127.json b/data/json/SpellDefinition/30127.json
index 62d2e1edbc4ec51699b52aeb3833f0d721302f6a..fd133ce4e66fc99aaf71025ddbd70975bff876a9 100644
--- a/data/json/SpellDefinition/30127.json
+++ b/data/json/SpellDefinition/30127.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30127,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 13.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/302.json b/data/json/SpellDefinition/302.json
index c974be89758a7089d1749dc492a5f7c324b5060a..8a8b20bcc76cff1a3fa32ae5bd7bb41ce8e4644f 100644
--- a/data/json/SpellDefinition/302.json
+++ b/data/json/SpellDefinition/302.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 302,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/304.json b/data/json/SpellDefinition/304.json
index a4af92acb8bfcfdcc8d3370a35793e30fab88d97..6d7db7e1acafe050db19a4e13ee1c1ff5047a252 100644
--- a/data/json/SpellDefinition/304.json
+++ b/data/json/SpellDefinition/304.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 304,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -64,21 +65,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 11.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 3.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/305.json b/data/json/SpellDefinition/305.json
index 17c426f3f11adcd0d29b3de6fc85e8706d49c69a..f541596f495f598a03de5c738b0730c8ac151d69 100644
--- a/data/json/SpellDefinition/305.json
+++ b/data/json/SpellDefinition/305.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 305,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/306.json b/data/json/SpellDefinition/306.json
index 28b39f5bfff49f52100bf625aa299fa34358055c..222a2c44dfeee587c57e591d5c3715448ebb38ab 100644
--- a/data/json/SpellDefinition/306.json
+++ b/data/json/SpellDefinition/306.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 306,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/30604.json b/data/json/SpellDefinition/30604.json
index febd9212c3666f5cd30912ae27f351980c2f69bf..bbf256550768a1b3f30b04ef5132ffe989ce6d9c 100644
--- a/data/json/SpellDefinition/30604.json
+++ b/data/json/SpellDefinition/30604.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30604,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/30697.json b/data/json/SpellDefinition/30697.json
index 1958d41749eed3b0dcc080642cf4c59095dab47d..adb00b09314f89515b1eb48ee3f898652c5d4dea 100644
--- a/data/json/SpellDefinition/30697.json
+++ b/data/json/SpellDefinition/30697.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30697,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/307.json b/data/json/SpellDefinition/307.json
index 5ebf54162061c7844230da0b9b1bd7f3059655fc..fb540f0d0f5be709d3a756fd90b663176e48596e 100644
--- a/data/json/SpellDefinition/307.json
+++ b/data/json/SpellDefinition/307.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 307,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         2
       ]
diff --git a/data/json/SpellDefinition/30785.json b/data/json/SpellDefinition/30785.json
index 8bc5bcb6a5fbf21109467629809e046ffe15c040..a53478998850f21b8f18644b9c841d5a3ff63ea8 100644
--- a/data/json/SpellDefinition/30785.json
+++ b/data/json/SpellDefinition/30785.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30785,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/308.json b/data/json/SpellDefinition/308.json
index 05d2ed05723aa4ef8a508e7b93231c19ee138f25..59ac1dcf1cda4f48c7baeaad1fb10f58a5328aa0 100644
--- a/data/json/SpellDefinition/308.json
+++ b/data/json/SpellDefinition/308.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 308,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/30855.json b/data/json/SpellDefinition/30855.json
index 2afb90b868458bb132717b6e6ea9423e986fd1c3..53d6897bcf2b7dba84918e684b277729b77ee2d8 100644
--- a/data/json/SpellDefinition/30855.json
+++ b/data/json/SpellDefinition/30855.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30855,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/309.json b/data/json/SpellDefinition/309.json
index 247172e2c6f99c43ba2528da3cf1a1db2232a635..3e1a3bf70d27cda89b5af0effd3a07e8f8a79d26 100644
--- a/data/json/SpellDefinition/309.json
+++ b/data/json/SpellDefinition/309.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 309,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -75,12 +76,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -90,7 +91,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE BWORK - Vague Fracassante",
diff --git a/data/json/SpellDefinition/30944.json b/data/json/SpellDefinition/30944.json
index 767bc0581ead823a97b664cda2129833a964d3d2..984bf0d05927f1a8fc3ae617a41d3ae14f8a55f3 100644
--- a/data/json/SpellDefinition/30944.json
+++ b/data/json/SpellDefinition/30944.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30944,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,30 +55,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 6.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 16.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/30971.json b/data/json/SpellDefinition/30971.json
index 8d20f07c98a7fe54ba76e3e587d75b98796b89be..d880114558bd3e7a77c15402f43f447b79da9797 100644
--- a/data/json/SpellDefinition/30971.json
+++ b/data/json/SpellDefinition/30971.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 30971,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/31.json b/data/json/SpellDefinition/31.json
index 7215bebee00516283af1e367000b4e3adf3b0128..b2820cf999203d7f7a53adc395f7d95f407870e9 100644
--- a/data/json/SpellDefinition/31.json
+++ b/data/json/SpellDefinition/31.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 31,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,21 +44,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 9.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/31060.json b/data/json/SpellDefinition/31060.json
index a6870bbfda9b13712c4df8c042a437b47ae727e0..45c5a422457858c8c2704671c79437e9717eb0cf 100644
--- a/data/json/SpellDefinition/31060.json
+++ b/data/json/SpellDefinition/31060.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 31060,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 17.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/311.json b/data/json/SpellDefinition/311.json
index 13ecbc49f193265f5bcfba3ed928529ef3e90ebe..e2c9e0294b563bc330bed43410350998b598722c 100644
--- a/data/json/SpellDefinition/311.json
+++ b/data/json/SpellDefinition/311.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 311,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         1
       ]
diff --git a/data/json/SpellDefinition/312.json b/data/json/SpellDefinition/312.json
index cec2e115441b4297688f68a516215e9246ed4a25..ebe9e87f4dce51ab38f565a55732ece24787a783 100644
--- a/data/json/SpellDefinition/312.json
+++ b/data/json/SpellDefinition/312.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 312,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
@@ -82,12 +89,12 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 10
+          "value": 50
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "at2",
-          "value": 5
+          "value": 25
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/3129.json b/data/json/SpellDefinition/3129.json
index fc97ca23ed751549ceeb44c94bda9d47a22d685d..2330e6654fc1b534d6eddeb6e9bbc029a5c39b42 100644
--- a/data/json/SpellDefinition/3129.json
+++ b/data/json/SpellDefinition/3129.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3129,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/313.json b/data/json/SpellDefinition/313.json
index 7064b6011f711ef14474ae7f4d455ea3b896deb8..d6e23563af32a0b7a36c83249f9dacd55fcb88d6 100644
--- a/data/json/SpellDefinition/313.json
+++ b/data/json/SpellDefinition/313.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 313,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/314.json b/data/json/SpellDefinition/314.json
index acd4bbbaa2a2c09b3f0a11c0ac690a07162acac1..fd4bbc7938a03daeb9c53b5ec9a55e34fa5a6892 100644
--- a/data/json/SpellDefinition/314.json
+++ b/data/json/SpellDefinition/314.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 314,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -78,21 +79,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 1.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 2.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/316.json b/data/json/SpellDefinition/316.json
index cfb5de7bffd7bf0983aa25417b41dcfe8b946e91..1fd32055695920e4e8bec5acb08c93aab248ef31 100644
--- a/data/json/SpellDefinition/316.json
+++ b/data/json/SpellDefinition/316.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 316,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,30 +56,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 12.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv",
           "baseValue": 13.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/318.json b/data/json/SpellDefinition/318.json
index a27f9f8a99a8b65c22b80efcb67a0d209f647ce5..70025e3dcf6b4fec4c03d52c3f44e6bf33577fe3 100644
--- a/data/json/SpellDefinition/318.json
+++ b/data/json/SpellDefinition/318.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 318,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/31908.json b/data/json/SpellDefinition/31908.json
index 031810716535ef22fd0fa280cbc6c91228035d29..c736f0f5e80bd48921fcf9c498f051daec63e210 100644
--- a/data/json/SpellDefinition/31908.json
+++ b/data/json/SpellDefinition/31908.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 31908,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 28.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/32.json b/data/json/SpellDefinition/32.json
index ce37eb69074aae8b57dac101092f8ec00a5e3817..406c72470c2c8e31ba2eef272c8e61cd9d66018e 100644
--- a/data/json/SpellDefinition/32.json
+++ b/data/json/SpellDefinition/32.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 32,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/322.json b/data/json/SpellDefinition/322.json
index 612a12c9f3f2644caa8703f276591623acec0310..e4fea31ace93eb0d80eb202d5271e6ba2976cca9 100644
--- a/data/json/SpellDefinition/322.json
+++ b/data/json/SpellDefinition/322.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 322,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
diff --git a/data/json/SpellDefinition/32216.json b/data/json/SpellDefinition/32216.json
index 20c38cb9f03108b23fa6d43e453a748790ed54d8..6e8eb3510c9b6dc2a57cbb2597d58884b98c51df 100644
--- a/data/json/SpellDefinition/32216.json
+++ b/data/json/SpellDefinition/32216.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 32216,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/32240.json b/data/json/SpellDefinition/32240.json
index f49e0bf485fcd66a8afba98c0f9eac180be6f09c..d8f5dcafcb5a39ab35d95a12f7eed1c2b811b4df 100644
--- a/data/json/SpellDefinition/32240.json
+++ b/data/json/SpellDefinition/32240.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 32240,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -69,30 +70,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/32262.json b/data/json/SpellDefinition/32262.json
index 31c0e0e1c4a9ea4c1a7e9cfae60f81f1d99fdb5f..374524c64abffae3ef4edf9467786fdaf3546126 100644
--- a/data/json/SpellDefinition/32262.json
+++ b/data/json/SpellDefinition/32262.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 32262,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 4.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 6.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/323.json b/data/json/SpellDefinition/323.json
index ed06e33b0bc7ff33efba1f3b167fb4f07b9ad1a2..7e65eaac5efae82b575ad86314ead573360c1e8e 100644
--- a/data/json/SpellDefinition/323.json
+++ b/data/json/SpellDefinition/323.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 323,
+    "merchantCosts": [],
     "tags": [
       1
     ],
diff --git a/data/json/SpellDefinition/324.json b/data/json/SpellDefinition/324.json
index 00caee007eceaba260744448215365dfe2402fe1..790205c1625c733bbc70b8a960f0c2640f1aa576 100644
--- a/data/json/SpellDefinition/324.json
+++ b/data/json/SpellDefinition/324.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 324,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
@@ -38,61 +45,26 @@
       "type": "TwoCastTargetDefinition",
       "selector1": {
         "type": "FilteredCharacterSelector",
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              2,
-              1,
-              3
-            ]
-          }
-        ]
+        "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -130,7 +102,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "GEMME - SET - NECROMIQUE - Vent Nécromique",
diff --git a/data/json/SpellDefinition/325.json b/data/json/SpellDefinition/325.json
index 65c5edf126e7f8e2af72bc1bf0a3580ec0ea7bf4..34060304b76c3537e62d23f5878d4b5f49235ee9 100644
--- a/data/json/SpellDefinition/325.json
+++ b/data/json/SpellDefinition/325.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 325,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -60,21 +61,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "hmin",
           "baseValue": 7.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "hmax",
           "baseValue": 9.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/32530.json b/data/json/SpellDefinition/32530.json
index d90df001647a67a749ad8e994bde5869d8601e23..d6e2f7662f875e4c6c75315203d4008700d8fd65 100644
--- a/data/json/SpellDefinition/32530.json
+++ b/data/json/SpellDefinition/32530.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 32530,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/326.json b/data/json/SpellDefinition/326.json
index fbc15ecc6fdd609c72c2513f81c64143d9acd6e2..663580ef4b033a3b0d5a26d5b108cc7f3653f6d9 100644
--- a/data/json/SpellDefinition/326.json
+++ b/data/json/SpellDefinition/326.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 326,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -88,21 +89,21 @@
           "value": 3
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "heal",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "HEAL",
           "baseValue": 21.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/32630.json b/data/json/SpellDefinition/32630.json
index 5783230798d7614b74bdba7950b21e0e13600407..538b9b1684feb5552e3d6cb55a2904f52e76993b 100644
--- a/data/json/SpellDefinition/32630.json
+++ b/data/json/SpellDefinition/32630.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 32630,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -136,7 +137,7 @@
       "hasEffects": true,
       "keywordReferences": [
         "PADMAAURA",
-        "COLLISION",
+        "PUSH",
         "DIRTY",
         {
           "type": 4,
diff --git a/data/json/SpellDefinition/327.json b/data/json/SpellDefinition/327.json
index e2546a3863d1a56a609854e970690b65b98c98f6..0401763fa56655695808180d7ac98fedc20e664a 100644
--- a/data/json/SpellDefinition/327.json
+++ b/data/json/SpellDefinition/327.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 327,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/3271.json b/data/json/SpellDefinition/3271.json
index 47081700473f9b915cea186a4b6d51cad343e5d7..a9faa1ebc0375a6804e950a1759dc5a7b12e97bb 100644
--- a/data/json/SpellDefinition/3271.json
+++ b/data/json/SpellDefinition/3271.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3271,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/328.json b/data/json/SpellDefinition/328.json
index fb7e581a98a212b914752888823eae7d795bfc4d..0bf80121cad956c3878292e4122a8847eecbedc2 100644
--- a/data/json/SpellDefinition/328.json
+++ b/data/json/SpellDefinition/328.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 328,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/329.json b/data/json/SpellDefinition/329.json
index 6748ab0fc25a2a41c6ca18d797031422e3dfa373..51090ebdf0ace014d5cf1463ad840622cade76cf 100644
--- a/data/json/SpellDefinition/329.json
+++ b/data/json/SpellDefinition/329.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 329,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/33.json b/data/json/SpellDefinition/33.json
index 5e1ddd3ddf0c38f19ca793c19c16a41f94ececc3..2ae275da4073bdaa68f4abdc3714cc934e160053 100644
--- a/data/json/SpellDefinition/33.json
+++ b/data/json/SpellDefinition/33.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 33,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 9
+          "value": 6
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "CRA - Pointe Harcelante",
diff --git a/data/json/SpellDefinition/330.json b/data/json/SpellDefinition/330.json
index 4bf10df46ea3bb8146de7e5d764fea3ccf659517..a8515319e1b303ce0b8bb91872ec0d1a58f3d379 100644
--- a/data/json/SpellDefinition/330.json
+++ b/data/json/SpellDefinition/330.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 330,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": true,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/332.json b/data/json/SpellDefinition/332.json
index 879c1d5bb72e1965cb8443729e4b8dd143b89616..f75ac87c10d318ab05121f06ec35a1893ea20dd3 100644
--- a/data/json/SpellDefinition/332.json
+++ b/data/json/SpellDefinition/332.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 332,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/33209.json b/data/json/SpellDefinition/33209.json
index 068d5967115aa009ef5ebf86c678aaa7ddcdebef..bd972f92265b9f71f9de0b16ce00c7b4e223aa03 100644
--- a/data/json/SpellDefinition/33209.json
+++ b/data/json/SpellDefinition/33209.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 33209,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -71,21 +72,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 19.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/33213.json b/data/json/SpellDefinition/33213.json
index baea3552452cdef30824d82e426a835c57aaa87f..a2a7e9fb066af461e17128ee1b4c47f74742b402 100644
--- a/data/json/SpellDefinition/33213.json
+++ b/data/json/SpellDefinition/33213.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 33213,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/333.json b/data/json/SpellDefinition/333.json
index 721c635ee5c97de84daea3a7b60e67de91e07dc7..45c9006c46206a3a599e6ffdafbddae824580251 100644
--- a/data/json/SpellDefinition/333.json
+++ b/data/json/SpellDefinition/333.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 333,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/3332.json b/data/json/SpellDefinition/3332.json
index 02127b328c27876272b287780021b643a27ecca6..af9d95a5714185f92ac29da02d6543429c9a597d 100644
--- a/data/json/SpellDefinition/3332.json
+++ b/data/json/SpellDefinition/3332.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3332,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 28
+          "value": 26
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "CRA - Pointe Répulsive",
diff --git a/data/json/SpellDefinition/334.json b/data/json/SpellDefinition/334.json
index ab7aeac5155ed07863068f13ee5815b783e40ca4..3b3554cc13961548985f9c52b4eefd474964d1e6 100644
--- a/data/json/SpellDefinition/334.json
+++ b/data/json/SpellDefinition/334.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 334,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/33400.json b/data/json/SpellDefinition/33400.json
index e57ad22c5ca6cbfd45b3d8081ee070674b9d97a9..bf592c0f8a170cd6bab5d1e2ecd5560185844515 100644
--- a/data/json/SpellDefinition/33400.json
+++ b/data/json/SpellDefinition/33400.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 33400,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -37,56 +38,26 @@
       "type": "TwoCastTargetDefinition",
       "selector1": {
         "type": "FilteredCharacterSelector",
+        "filters": []
+      },
+      "selector2": {
+        "type": "FilteredCoordSelector",
         "filters": [
           {
-            "type": "TeamFilter",
-            "isIdentical": false,
-            "reference": {
-              "type": "CasterSelector"
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
+            },
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
           }
         ]
-      },
-      "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
-            }
-          ]
-        }
       }
     },
     "spellEffectData": [
@@ -118,30 +89,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 15.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -152,7 +114,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "COLLISION"
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/33464.json b/data/json/SpellDefinition/33464.json
index 1c4d3981c20a087eade13f4116bdc6d819d1a114..941f101f302237ee9fa489a3f85611f8eb5a62ce 100644
--- a/data/json/SpellDefinition/33464.json
+++ b/data/json/SpellDefinition/33464.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 33464,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 5.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 6.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/335.json b/data/json/SpellDefinition/335.json
index d18f9d4661eee6958f617dfa0c4bfc75959b9919..f12e1cf57be29851c02e9a2c50701b2c37415a88 100644
--- a/data/json/SpellDefinition/335.json
+++ b/data/json/SpellDefinition/335.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 335,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/338.json b/data/json/SpellDefinition/338.json
index d09af6da0873768c172b7c41fda0fc9ba2ef640f..ba4df0c4c392a00d4e6183da9283fcf5ffb16d74 100644
--- a/data/json/SpellDefinition/338.json
+++ b/data/json/SpellDefinition/338.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 338,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -76,22 +77,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "atmin",
-          "baseValue": 3.5,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "atmax",
-          "baseValue": 5.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 25
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/339.json b/data/json/SpellDefinition/339.json
index 5dd07013a57fdda0fd35af21f19d0cee018df4c4..6ce2269c9a965a2aa7f6bbec36468380ea55e3b7 100644
--- a/data/json/SpellDefinition/339.json
+++ b/data/json/SpellDefinition/339.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 339,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/34.json b/data/json/SpellDefinition/34.json
index 792167545bb5a1f7548adf3ef149c27e5a8e6d28..d7d39f51320b388f556999f264d4f409c0af3ed8 100644
--- a/data/json/SpellDefinition/34.json
+++ b/data/json/SpellDefinition/34.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -60,21 +61,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/340.json b/data/json/SpellDefinition/340.json
index 4879e421139adee770a69fb70b19c28455e29ac9..297323df60f04d0375e382eb3744b4bbab5d6b25 100644
--- a/data/json/SpellDefinition/340.json
+++ b/data/json/SpellDefinition/340.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 340,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -88,12 +89,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 4.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/34014.json b/data/json/SpellDefinition/34014.json
index 817e77a476664483ce357cf4dd3a00e25435b9f6..ca138d33abebd6e514a010fda9718813ced6478a 100644
--- a/data/json/SpellDefinition/34014.json
+++ b/data/json/SpellDefinition/34014.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34014,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/341.json b/data/json/SpellDefinition/341.json
index dcc913e060bed6f61f3a38c0b33e168bc3bf6518..ba319ad118e604e504165b164f8e5b3ad4482828 100644
--- a/data/json/SpellDefinition/341.json
+++ b/data/json/SpellDefinition/341.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 341,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/34112.json b/data/json/SpellDefinition/34112.json
index 5a234542dfbc9fb2439ceb2acd7c5e268579368a..832f261ea88c182f11ca4860dee45a11eeb7ce5b 100644
--- a/data/json/SpellDefinition/34112.json
+++ b/data/json/SpellDefinition/34112.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34112,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -139,30 +140,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 22.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 27.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         },
         {
@@ -173,7 +165,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "COLLISION"
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/34114.json b/data/json/SpellDefinition/34114.json
index e01cb7b05f51d41756143801d395be3e62c3fc0c..df789f437328c9583ac007d0b30104158865c5c1 100644
--- a/data/json/SpellDefinition/34114.json
+++ b/data/json/SpellDefinition/34114.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34114,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/34159.json b/data/json/SpellDefinition/34159.json
index d1f6c6afc337494d89a7643baa59692d221e8c0c..f7d20b9cacaee0644009688424e6fa119d99f6af 100644
--- a/data/json/SpellDefinition/34159.json
+++ b/data/json/SpellDefinition/34159.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34159,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/342.json b/data/json/SpellDefinition/342.json
index 0a862a186d6f1aaa7c7ae001707d24412eed92be..68b266c91a79e1d99934749c26fa73e49e7ac67c 100644
--- a/data/json/SpellDefinition/342.json
+++ b/data/json/SpellDefinition/342.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 342,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/343.json b/data/json/SpellDefinition/343.json
index 3d3fc77b44ff3d09494ea7246ed859bd80530f91..5bd6eb732968db39cb1ae859b327da8c5c722170 100644
--- a/data/json/SpellDefinition/343.json
+++ b/data/json/SpellDefinition/343.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 343,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/34538.json b/data/json/SpellDefinition/34538.json
index daa9e2012190a8352cd2f05ec766aa6924916cdc..4cca5ea3250e18baa409fcf811e7ec9264cd06f8 100644
--- a/data/json/SpellDefinition/34538.json
+++ b/data/json/SpellDefinition/34538.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34538,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -100,22 +101,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min",
-          "baseValue": 7.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "max",
-          "baseValue": 9.6,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 60
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/347.json b/data/json/SpellDefinition/347.json
index 78964238b62e2ed51ac894188f528f8b5ebd3ec5..a3d47eb39797b1cd08f74490a1ae334d62008b99 100644
--- a/data/json/SpellDefinition/347.json
+++ b/data/json/SpellDefinition/347.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 347,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 4.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 4.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/34724.json b/data/json/SpellDefinition/34724.json
index 37d010292400095d5d91d7e65a1dac4703250160..3560bc797dd951bf325c00f849a4b0d136b9dbfd 100644
--- a/data/json/SpellDefinition/34724.json
+++ b/data/json/SpellDefinition/34724.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 34724,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/348.json b/data/json/SpellDefinition/348.json
index 1e97e8a6c1d6402eba57128010df4337611f7789..414f7519c57b225f198dac499cfa0c8cc41975cf 100644
--- a/data/json/SpellDefinition/348.json
+++ b/data/json/SpellDefinition/348.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 348,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -57,30 +58,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v2",
           "baseValue": 5.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/349.json b/data/json/SpellDefinition/349.json
index ecc04d1231623939581673739c2e5d1ec7dde95e..ecfae1129db05244b36a356590e1118b9677f73d 100644
--- a/data/json/SpellDefinition/349.json
+++ b/data/json/SpellDefinition/349.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 349,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/35.json b/data/json/SpellDefinition/35.json
index fd0a8c2642dee4785ceada6554e2fdd914729d04..7120913abce2a4eccd83274c5a3ea87dfe2a584a 100644
--- a/data/json/SpellDefinition/35.json
+++ b/data/json/SpellDefinition/35.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 35,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/3502.json b/data/json/SpellDefinition/3502.json
index e5cd623cfc16ea5cbc32a097588c916d4d243da2..8444aecf77c5a8cf4f97691ee77b861b101cbb26 100644
--- a/data/json/SpellDefinition/3502.json
+++ b/data/json/SpellDefinition/3502.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3502,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/353.json b/data/json/SpellDefinition/353.json
index a1c03b99082f240422428150f93dee1acc5f903d..4f5c96903fc68f2475c50ebbb6c288fc2357bd50 100644
--- a/data/json/SpellDefinition/353.json
+++ b/data/json/SpellDefinition/353.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 353,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/35338.json b/data/json/SpellDefinition/35338.json
index 6551efeb4f622e68a27aaf5e9d910bbfa01e02a1..66e51bc2e67474982979f178fa861ca73b0a0cca 100644
--- a/data/json/SpellDefinition/35338.json
+++ b/data/json/SpellDefinition/35338.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 35338,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/355.json b/data/json/SpellDefinition/355.json
index f711eaf7dda77ac39dab3106d21ac9fdf9b4f94d..0b5cffccb148174b996bfc9ae766540d556bf40b 100644
--- a/data/json/SpellDefinition/355.json
+++ b/data/json/SpellDefinition/355.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 355,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -67,12 +68,12 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 8
+          "value": 50
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "at1",
-          "value": 6
+          "value": 40
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/356.json b/data/json/SpellDefinition/356.json
index 4cf3a8f09c3e759783ff4999aefae543dc68e4eb..58fa35098e6839ea52389eade841b559f1659eeb 100644
--- a/data/json/SpellDefinition/356.json
+++ b/data/json/SpellDefinition/356.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 356,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -74,21 +75,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 16.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 20.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/358.json b/data/json/SpellDefinition/358.json
index 576ce6fd25b52a28cd89477a1f6029afcf606f9b..ec736e17305e49bdc2096d973a636793bad66c2b 100644
--- a/data/json/SpellDefinition/358.json
+++ b/data/json/SpellDefinition/358.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 358,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/35893.json b/data/json/SpellDefinition/35893.json
index a421021324dfd2fc04565fd7273a7e9e2cf7591b..de609c69e905ab0fc3398f0b9cc10504ea1b22f8 100644
--- a/data/json/SpellDefinition/35893.json
+++ b/data/json/SpellDefinition/35893.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 35893,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,30 +56,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 21.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h2",
           "baseValue": 9.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/359.json b/data/json/SpellDefinition/359.json
index cb844177b2d7449e499c54b53f00394a6aa3e911..0005e52e3f382c27926183714ebbf3c2d5f7a9da 100644
--- a/data/json/SpellDefinition/359.json
+++ b/data/json/SpellDefinition/359.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 359,
+    "merchantCosts": [],
     "tags": [
       1
     ],
diff --git a/data/json/SpellDefinition/360.json b/data/json/SpellDefinition/360.json
index 89d0e5e4d0496987d750e24e53436209ca1457b3..88099e98a15ee992299c39f35134314a1cd88783 100644
--- a/data/json/SpellDefinition/360.json
+++ b/data/json/SpellDefinition/360.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 360,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/361.json b/data/json/SpellDefinition/361.json
index 6f6f6d90efe265ea12ea1353594d8e7ec7e342d4..5f2782247bb88e154086c8f338716c1b121915a2 100644
--- a/data/json/SpellDefinition/361.json
+++ b/data/json/SpellDefinition/361.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 361,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/36117.json b/data/json/SpellDefinition/36117.json
index 75a61503a3b110e6db8f1b432d206c4b1357f12e..30a446a5dae0e1c9e8813fa339915873fe3c45ac 100644
--- a/data/json/SpellDefinition/36117.json
+++ b/data/json/SpellDefinition/36117.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 36117,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/362.json b/data/json/SpellDefinition/362.json
index 60e7be6fb76ad60a79534e138a5ea72b794cf6af..d029d6a849b7d504d29e6c713ac8d56391ffd308 100644
--- a/data/json/SpellDefinition/362.json
+++ b/data/json/SpellDefinition/362.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 362,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/363.json b/data/json/SpellDefinition/363.json
index da5e26c7d66df62e8a483f25ba0b0382d38a7e9b..cdbb3cede33018d82776844c1c806ec0b7ff52c6 100644
--- a/data/json/SpellDefinition/363.json
+++ b/data/json/SpellDefinition/363.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 363,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -72,21 +73,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 24.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 30.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         }
       ],
@@ -106,6 +107,6 @@
   "m_i18nNameId": 84380,
   "m_i18nDescriptionId": 20269,
   "m_elementaryStates": 1,
-  "assetGuid": "5129f515bf1d6ac41b467658afc17e03",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/364.json b/data/json/SpellDefinition/364.json
index f1462859e549f0b1a89831084cdf5cfa1efa269c..56d231b7d52bbbf026e6c84f4f60423f4ef8809f 100644
--- a/data/json/SpellDefinition/364.json
+++ b/data/json/SpellDefinition/364.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 364,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -131,7 +132,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 5
+          "value": 20
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/36461.json b/data/json/SpellDefinition/36461.json
index 5068a63c22caaa2038400500ea5bf2a534f9c1cc..3c1e703b5c0f13bfe0c05d3827ab2fc3d90d84cb 100644
--- a/data/json/SpellDefinition/36461.json
+++ b/data/json/SpellDefinition/36461.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 36461,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -76,21 +77,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 23.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 28.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/36618.json b/data/json/SpellDefinition/36618.json
index 04f1d0c78e0c4fdce017e81760830c6e97e447ba..f1cede19425d5068f8f66d3021f04e94c9579deb 100644
--- a/data/json/SpellDefinition/36618.json
+++ b/data/json/SpellDefinition/36618.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 36618,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/36673.json b/data/json/SpellDefinition/36673.json
index a29838549e966d889e4bb977cd4d436a4bb5003d..495e52492231c13e78dac9930ad64b1b04c2af20 100644
--- a/data/json/SpellDefinition/36673.json
+++ b/data/json/SpellDefinition/36673.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 36673,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -68,21 +69,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 16.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/367.json b/data/json/SpellDefinition/367.json
index 3d84f46c03d30564a61e3ca8feb85b112cf9d424..4ed9bcf0d61a6bbc4a8dabae82a7615c3c7a53c2 100644
--- a/data/json/SpellDefinition/367.json
+++ b/data/json/SpellDefinition/367.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 367,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/3678.json b/data/json/SpellDefinition/3678.json
index c5b850a21b35731f138089560c7b41bfef395487..3d97a1001e5e066ce53c6fb7135eafe94a985277 100644
--- a/data/json/SpellDefinition/3678.json
+++ b/data/json/SpellDefinition/3678.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3678,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/368.json b/data/json/SpellDefinition/368.json
index bd71d025d7d4f7355b7176b1ca296009ad678544..21e184c5050ae00163a61fbfb6f5396db996668b 100644
--- a/data/json/SpellDefinition/368.json
+++ b/data/json/SpellDefinition/368.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 368,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,7 +44,7 @@
     "spellEffectData": [
       {
         "type": "SpellEffectInstantiationData",
-        "spellEffect": "381203b4e09bdbc4cba795bffe224b88",
+        "spellEffect": "16babd3e1942ef546ab74a18ab7b61f5",
         "originTarget": {
           "type": "FirstCastTargetSelector"
         }
@@ -71,7 +72,8 @@
       "hasEffects": true,
       "keywordReferences": [
         "CHAMPIONAURA",
-        "LIGHTNING"
+        "LIGHTNING",
+        "DEATHBLOW"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/369.json b/data/json/SpellDefinition/369.json
index 5ff942a7d1d697f3e76d621aa765fd8f1575ca94..54bf23f1b62439a87815574868b6cef3af5ec229 100644
--- a/data/json/SpellDefinition/369.json
+++ b/data/json/SpellDefinition/369.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 369,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/37.json b/data/json/SpellDefinition/37.json
index c70f625e3eda8df5a94055182c2dd6fbdd84f42e..d6cc56c32347498fea225b25b79db33da5836fec 100644
--- a/data/json/SpellDefinition/37.json
+++ b/data/json/SpellDefinition/37.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 37,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
diff --git a/data/json/SpellDefinition/371.json b/data/json/SpellDefinition/371.json
index c075b692b2349c7e25b81310676d6a7926d138f5..fd7a2dc8239df232e61411d52359ca5cae699723 100644
--- a/data/json/SpellDefinition/371.json
+++ b/data/json/SpellDefinition/371.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 371,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/372.json b/data/json/SpellDefinition/372.json
index 5393aa9806cae9f2307f19e0bd70606cf63c526a..bdfd3a8b74ab0660ab8b66f30dbc548ee097133f 100644
--- a/data/json/SpellDefinition/372.json
+++ b/data/json/SpellDefinition/372.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 372,
+    "merchantCosts": [],
     "tags": [
       0
     ],
@@ -78,7 +79,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 6
+          "value": 20
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/SpellDefinition/373.json b/data/json/SpellDefinition/373.json
index 2c0d16b5297839f67ac95c960b7dcf049cfb9fec..aaf9fe96ffa24226c551d14958ebe77b8e297307 100644
--- a/data/json/SpellDefinition/373.json
+++ b/data/json/SpellDefinition/373.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 373,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/37386.json b/data/json/SpellDefinition/37386.json
index a16026ff5688a86740a105aa04c2c7541894f581..2849a0151feacb47afc58b0a80d9743c34a7e0e7 100644
--- a/data/json/SpellDefinition/37386.json
+++ b/data/json/SpellDefinition/37386.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 37386,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 23.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/37652.json b/data/json/SpellDefinition/37652.json
index 8b1e1f6d3950fae832bccf2ba907e370d4fa19af..81671fb478fc8e9e34eb6b5c771f73602b5d3619 100644
--- a/data/json/SpellDefinition/37652.json
+++ b/data/json/SpellDefinition/37652.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 37652,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -46,31 +47,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 12.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 20
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/377.json b/data/json/SpellDefinition/377.json
index 69ae627892a07b9bc5c733661497f08b595b9c44..bdbad4e2ed5635db9db434bd3ff0c0a76ac42889 100644
--- a/data/json/SpellDefinition/377.json
+++ b/data/json/SpellDefinition/377.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 377,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/37792.json b/data/json/SpellDefinition/37792.json
index 50a9966a4f0c6ca5c392dd000388e0fe3da1a58a..eddcc652d4ddc17a5f1561be1be68be479ae4f5f 100644
--- a/data/json/SpellDefinition/37792.json
+++ b/data/json/SpellDefinition/37792.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 37792,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,22 +46,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 5.4,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 35
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/378.json b/data/json/SpellDefinition/378.json
index 5e01d727d23b9c9914257b53d44166cbb03688e9..58e14c0a97f70b398087311381a4adc3ec4c9249 100644
--- a/data/json/SpellDefinition/378.json
+++ b/data/json/SpellDefinition/378.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 378,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/379.json b/data/json/SpellDefinition/379.json
index 87041d853c85c45d97d36d2d76df7f7add68e377..d1af2613d7b9ac4210d38b6427d13b8629d8fb45 100644
--- a/data/json/SpellDefinition/379.json
+++ b/data/json/SpellDefinition/379.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 379,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -115,12 +116,12 @@
           "value": 7
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -140,7 +141,8 @@
         {
           "type": 6,
           "id": 278
-        }
+        },
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/38.json b/data/json/SpellDefinition/38.json
index c7a44f57db73d971b3462e05c8a1df7bc0e68d55..2d39ae9add4b78f31669c586b23d0d46e0f94c45 100644
--- a/data/json/SpellDefinition/38.json
+++ b/data/json/SpellDefinition/38.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/380.json b/data/json/SpellDefinition/380.json
index c831446f2784eb12355c4ee2109350e2559a5d27..447d2c794910f23cb7e4bf3aa6b264e7bbbfec37 100644
--- a/data/json/SpellDefinition/380.json
+++ b/data/json/SpellDefinition/380.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 380,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/38030.json b/data/json/SpellDefinition/38030.json
index 84d59af1546a97477647ee113a24cc25d59da3ea..f98cb59091c19b3a8bde3775db100d682d93755d 100644
--- a/data/json/SpellDefinition/38030.json
+++ b/data/json/SpellDefinition/38030.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38030,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/38097.json b/data/json/SpellDefinition/38097.json
index debc3a0907f0dff63d122f831ca897052d16e4d1..604bb5d87595db546738e86690c8d2364191f048 100644
--- a/data/json/SpellDefinition/38097.json
+++ b/data/json/SpellDefinition/38097.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38097,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -74,21 +75,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 14.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/381.json b/data/json/SpellDefinition/381.json
index 6cbc17fe0d3703404d0a77d9e7194661fbec5322..b244322b9f1c8a10844ace107f175811c843fbe2 100644
--- a/data/json/SpellDefinition/381.json
+++ b/data/json/SpellDefinition/381.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 381,
+    "merchantCosts": [],
     "tags": [
       3
     ],
@@ -82,7 +83,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 10
+          "value": 50
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/382.json b/data/json/SpellDefinition/382.json
index 1a35144e32e0032cd9c7cce3ac18c8c6737b1c08..4bc39106e21beca100d8803574721b3a054af15b 100644
--- a/data/json/SpellDefinition/382.json
+++ b/data/json/SpellDefinition/382.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 382,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -104,13 +105,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 10.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 40
         }
       ],
       "hasEffects": true,
@@ -133,6 +130,6 @@
   "m_i18nNameId": 2750,
   "m_i18nDescriptionId": 1584,
   "m_elementaryStates": 1,
-  "assetGuid": "261e13f408a8d5445b8112252c01929f",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/383.json b/data/json/SpellDefinition/383.json
index 73aa3e19353dc8319358f896a2032bbe05db5052..c610e4e7d8eea9b2584440ed266fc7c5df37e57e 100644
--- a/data/json/SpellDefinition/383.json
+++ b/data/json/SpellDefinition/383.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 383,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/38345.json b/data/json/SpellDefinition/38345.json
index 6618561fc300e71a1cd7e4afdc242f58ad308799..cee1b8d95f8d71e72a1a9ee477ce8bbca8193c8f 100644
--- a/data/json/SpellDefinition/38345.json
+++ b/data/json/SpellDefinition/38345.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38345,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 8.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/386.json b/data/json/SpellDefinition/386.json
index c35ac7a76d62983a0e0527f1ed7e3a7710c437d8..b22decc71f815abe1adec8b349c605ade8951c4f 100644
--- a/data/json/SpellDefinition/386.json
+++ b/data/json/SpellDefinition/386.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 386,
+    "merchantCosts": [],
     "tags": [
       7
     ],
diff --git a/data/json/SpellDefinition/38654.json b/data/json/SpellDefinition/38654.json
index 5b90ef1f8d4c87eeecccbdf9da54c2d8951d3446..23c50b17bb8581adbe64e115c3e654f9da9fa02d 100644
--- a/data/json/SpellDefinition/38654.json
+++ b/data/json/SpellDefinition/38654.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38654,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/38698.json b/data/json/SpellDefinition/38698.json
index e30aa2fd41e744c8cf5062fcd08bbc0ab815c8df..245c3aa5a7b5580d6e7de08f8a13bf84b87241bc 100644
--- a/data/json/SpellDefinition/38698.json
+++ b/data/json/SpellDefinition/38698.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38698,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 21.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/387.json b/data/json/SpellDefinition/387.json
index 2efdcfcd736aa041cea509aed7d3ab049251a873..13752f2096a81ca3eeba2a6b8784ed5806ff0d8a 100644
--- a/data/json/SpellDefinition/387.json
+++ b/data/json/SpellDefinition/387.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 387,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
       "equipable": true,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/38706.json b/data/json/SpellDefinition/38706.json
index 216a73c2642abb9c7b7343ded7c1fa92a791ea30..410e916c0525cfcfa579e5a03b05608ccf32ad5b 100644
--- a/data/json/SpellDefinition/38706.json
+++ b/data/json/SpellDefinition/38706.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 38706,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -46,21 +47,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 16.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/388.json b/data/json/SpellDefinition/388.json
index 1068f7551952f0ba9468debd61955b3e28ae0f04..4748178c0eed4c8308831ae8a7a04edbdb13b808 100644
--- a/data/json/SpellDefinition/388.json
+++ b/data/json/SpellDefinition/388.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 388,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -24,57 +25,9 @@
       }
     ],
     "castTarget": {
-      "type": "TwoCastTargetDefinition",
-      "selector1": {
-        "type": "FilteredCharacterSelector",
-        "filters": [
-          {
-            "type": "FamilyFilter",
-            "condition": 1,
-            "families": [
-              40
-            ]
-          },
-          {
-            "type": "TeamFilter",
-            "isIdentical": true,
-            "reference": {
-              "type": "CasterSelector"
-            }
-          },
-          {
-            "type": "EntityHasEnemyInAttackRangeFilter"
-          }
-        ]
-      },
-      "selector2": {
-        "type": "FilteredCharacterSelector",
-        "filters": [
-          {
-            "type": "FamilyFilter",
-            "condition": 1,
-            "families": [
-              40
-            ]
-          },
-          {
-            "type": "TeamFilter",
-            "isIdentical": true,
-            "reference": {
-              "type": "CasterSelector"
-            }
-          },
-          {
-            "type": "EntityHasEnemyInAttackRangeFilter"
-          },
-          {
-            "type": "NotEntityFilter",
-            "filter": {
-              "type": "CastTargetFilter",
-              "castTargetIndex": 0
-            }
-          }
-        ]
+      "type": "OneCastTargetDefinition",
+      "selector": {
+        "type": "CenterMapCoordSelector"
       }
     },
     "spellEffectData": [
@@ -84,21 +37,13 @@
         "originTarget": {
           "type": "FirstCastTargetSelector"
         }
-      },
-      {
-        "type": "SpellEffectInstantiationData",
-        "spellEffect": "033c1430fcfe06141b2f9f33eadcabe8",
-        "originTarget": {
-          "type": "SecondCastTargetSelector"
-        }
       }
     ],
     "eventsInvalidatingCost": [
       2
     ],
     "eventsInvalidatingCasting": [
-      2,
-      8
+      2
     ],
     "eventsInvalidatingTooltip": [
       2,
@@ -108,22 +53,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min",
-          "baseValue": 8.5,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "max",
-          "baseValue": 10.3,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 60
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/3886.json b/data/json/SpellDefinition/3886.json
index edb68602b7c643752fc5b4ba9ab43ecbb004a843..6c5805afb8216dfdd72ea10b7f41fbdcf05acecc 100644
--- a/data/json/SpellDefinition/3886.json
+++ b/data/json/SpellDefinition/3886.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 3886,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/389.json b/data/json/SpellDefinition/389.json
index 168178df3657cf37627fd563b60e90d3e88d7dea..1fc196ba88411d2f5d0a36723e7efe65da97ece2 100644
--- a/data/json/SpellDefinition/389.json
+++ b/data/json/SpellDefinition/389.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 389,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/39.json b/data/json/SpellDefinition/39.json
index 67f62b89c72241814291365af10def0bf67c2de3..4ce2be275f9d4e98c053a85e1aa16e93ba25f879 100644
--- a/data/json/SpellDefinition/39.json
+++ b/data/json/SpellDefinition/39.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 39,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/390.json b/data/json/SpellDefinition/390.json
index c5b281351e59767c6d88352a3ed7d6ebb610990c..bdace2d9c193da65d41179500c228e3a69b54f23 100644
--- a/data/json/SpellDefinition/390.json
+++ b/data/json/SpellDefinition/390.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 390,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         1
       ]
diff --git a/data/json/SpellDefinition/39161.json b/data/json/SpellDefinition/39161.json
index 06e496c7d3004167d40211faecb89da23c4e029e..73e9223b91892bf20f7d371338fcd9e0617115bd 100644
--- a/data/json/SpellDefinition/39161.json
+++ b/data/json/SpellDefinition/39161.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 39161,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.45,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 18.25,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/392.json b/data/json/SpellDefinition/392.json
index 4df3b9d85218174c5c352019a278a4c731346e2b..b4ab3636bcdba94848a9d8ea56463a3348b872c8 100644
--- a/data/json/SpellDefinition/392.json
+++ b/data/json/SpellDefinition/392.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 392,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,26 +44,7 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1
-            ]
-          },
-          {
-            "type": "TeamFilter",
-            "isIdentical": true,
-            "reference": {
-              "type": "CasterSelector"
-            }
-          }
-        ]
+        "type": "CasterHeroSelector"
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/393.json b/data/json/SpellDefinition/393.json
index 800eb87e5f4342ba90a4ef399b8401c57e7c2a56..910e80e95d2e1af4409116344935aac66d0a3c09 100644
--- a/data/json/SpellDefinition/393.json
+++ b/data/json/SpellDefinition/393.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 393,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/394.json b/data/json/SpellDefinition/394.json
index 25a770aadd7f9ad5e6a98e5c534bde4439d304e0..bd81b227cc62d308f91449d2fbd5551f39647ff4 100644
--- a/data/json/SpellDefinition/394.json
+++ b/data/json/SpellDefinition/394.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 394,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/395.json b/data/json/SpellDefinition/395.json
index cd38415566b877497e51a1ab516c361667da1f30..7bd088f3ad508b80958d2bb3b9a08bbe3fad1036 100644
--- a/data/json/SpellDefinition/395.json
+++ b/data/json/SpellDefinition/395.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 395,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/39594.json b/data/json/SpellDefinition/39594.json
index 0b09f48e6f9acdc0263b8ef01bd2e1d2644aacde..250d50472f2b2cd0f546498c24322470dff1270d 100644
--- a/data/json/SpellDefinition/39594.json
+++ b/data/json/SpellDefinition/39594.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 39594,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/396.json b/data/json/SpellDefinition/396.json
index b8019853def1091a5dedfd84bff5f42b9d8c6322..d9329a1f3e0079301b40bbab8f8b2039fba15f9b 100644
--- a/data/json/SpellDefinition/396.json
+++ b/data/json/SpellDefinition/396.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 396,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,31 +63,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 14.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 3.9,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 20
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/397.json b/data/json/SpellDefinition/397.json
index 072ca97ff604fd1ffba3c93c96726c3ce5d68218..3e3f117c885d6eecdcc13fd485ee896b64e19b96 100644
--- a/data/json/SpellDefinition/397.json
+++ b/data/json/SpellDefinition/397.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 397,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/398.json b/data/json/SpellDefinition/398.json
index ebd51f77700d398785be98d4e203278588213d6f..aff1cb3b07378c8da0b3912efd3767d12b1154b3 100644
--- a/data/json/SpellDefinition/398.json
+++ b/data/json/SpellDefinition/398.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 398,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/399.json b/data/json/SpellDefinition/399.json
index ca98d8b309d78865e93ef077501bb8e136bcf2cc..9f7730d226225835d3eff5fcd1f2d690d00b8bfd 100644
--- a/data/json/SpellDefinition/399.json
+++ b/data/json/SpellDefinition/399.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 399,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/4.json b/data/json/SpellDefinition/4.json
index a0112028c3f17cc0648857174686d440d0e41da4..b4ab554fd7868f71addda1ee7d055f85f306de6f 100644
--- a/data/json/SpellDefinition/4.json
+++ b/data/json/SpellDefinition/4.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 4,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -57,21 +58,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 18.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/400.json b/data/json/SpellDefinition/400.json
index b88fcc385154ed1683a16c5465caea00016936ee..7c6ccf6677b5c1c47f601615a2e1a9587a8a07b0 100644
--- a/data/json/SpellDefinition/400.json
+++ b/data/json/SpellDefinition/400.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 400,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/40165.json b/data/json/SpellDefinition/40165.json
index e14f756b78d7ccda66c9f5be618692e9ffc0910e..0588cd4660bd6944f7f0eb93383d2f91740c9d7a 100644
--- a/data/json/SpellDefinition/40165.json
+++ b/data/json/SpellDefinition/40165.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 40165,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -71,21 +72,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/402.json b/data/json/SpellDefinition/402.json
index b5fca6e91fbd1ac0afedb8bc98de11ff70fe1a7f..0d11800483be8dbfae750b25b00703a87306a75d 100644
--- a/data/json/SpellDefinition/402.json
+++ b/data/json/SpellDefinition/402.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 402,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/403.json b/data/json/SpellDefinition/403.json
index 4caea96d9ee863728d23e3b03f73d8a4acaadce9..c607d4cba5234b3dfbdea85f4876b0a127e767aa 100644
--- a/data/json/SpellDefinition/403.json
+++ b/data/json/SpellDefinition/403.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 403,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/404.json b/data/json/SpellDefinition/404.json
index 27dd0e575a23b322e4e17da33586cdb9c05b4379..d3fe4304d3e1c330930cc2a0140544859d4e9a9e 100644
--- a/data/json/SpellDefinition/404.json
+++ b/data/json/SpellDefinition/404.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 404,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "FANTOME - Hantise",
diff --git a/data/json/SpellDefinition/405.json b/data/json/SpellDefinition/405.json
index 631481720c78b7ff6fd0f8342f5283d14fbb86e0..76dac86b62d98157cffba54dbfbb2b33d1cdb43a 100644
--- a/data/json/SpellDefinition/405.json
+++ b/data/json/SpellDefinition/405.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 405,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -68,21 +69,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 5.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "H",
           "baseValue": 6.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/40571.json b/data/json/SpellDefinition/40571.json
index 7b8b44fb2feed93087cd2620b4dd3ac5a2e66572..d9b1ffe4cdef9d5c6b1927a8ecd959ebaf4d1ef7 100644
--- a/data/json/SpellDefinition/40571.json
+++ b/data/json/SpellDefinition/40571.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 40571,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/40574.json b/data/json/SpellDefinition/40574.json
index 5062848617e18096fbfe3bce4a88b397123e3094..494b4e014480aba56f0da04f4a51715b44c805e6 100644
--- a/data/json/SpellDefinition/40574.json
+++ b/data/json/SpellDefinition/40574.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 40574,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,30 +63,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 5.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/406.json b/data/json/SpellDefinition/406.json
index 0b4fe6dbd591d3facece7b93f318b3153a79dff2..80736f1500c89cba59548bd8083e2c81259cab10 100644
--- a/data/json/SpellDefinition/406.json
+++ b/data/json/SpellDefinition/406.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 406,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -39,48 +46,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -123,7 +105,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "GEMME - COMMUN - AIR - Aerovue",
diff --git a/data/json/SpellDefinition/407.json b/data/json/SpellDefinition/407.json
index ef789d148295c2d6d6202bdac3ea20c7af7ab186..ec5b847703484c528ed5f3ec022c11daf843daae 100644
--- a/data/json/SpellDefinition/407.json
+++ b/data/json/SpellDefinition/407.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 407,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/40705.json b/data/json/SpellDefinition/40705.json
index 48d08e18916f9af982cd2a72c52c13dcec14c080..5eff18054c04b0388ed6274e67ae8ad50ca18df5 100644
--- a/data/json/SpellDefinition/40705.json
+++ b/data/json/SpellDefinition/40705.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 40705,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -87,7 +88,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE BWORK - GARDIEN - Arm Drag",
diff --git a/data/json/SpellDefinition/40744.json b/data/json/SpellDefinition/40744.json
index 4e8b97472bb29ceb892af55f710337d6b5fa29a2..c0b5ffbda4d28a77b0c94f8ee730e18223e92b87 100644
--- a/data/json/SpellDefinition/40744.json
+++ b/data/json/SpellDefinition/40744.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 40744,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/408.json b/data/json/SpellDefinition/408.json
index ef853fe2c6dc99839f8173156c0def699c5c58a1..f6f09ae025121a5f033d17ecc30789b46636926d 100644
--- a/data/json/SpellDefinition/408.json
+++ b/data/json/SpellDefinition/408.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 408,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/40808.json b/data/json/SpellDefinition/40808.json
index 9cb44e319554cede23b5a325ed0d89648f612ce3..f70cfb5ae7beceb5cadeb1dde3a4248cb99d5e15 100644
--- a/data/json/SpellDefinition/40808.json
+++ b/data/json/SpellDefinition/40808.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 40808,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -59,7 +60,7 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": []
     }
   },
diff --git a/data/json/SpellDefinition/409.json b/data/json/SpellDefinition/409.json
index e2c1adbc6c7422309d7d4b78d4ed904953d01315..1285397105243b2cb4376b021be9ea8cfaa032b0 100644
--- a/data/json/SpellDefinition/409.json
+++ b/data/json/SpellDefinition/409.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 409,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/410.json b/data/json/SpellDefinition/410.json
index 4593174c12fe38c4fed37e69ad20d09f25b080c1..d19923075ee66f7bd7a905c30f8f71458a913b3e 100644
--- a/data/json/SpellDefinition/410.json
+++ b/data/json/SpellDefinition/410.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 410,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/411.json b/data/json/SpellDefinition/411.json
index 697daeb30123187715c112534cdd0faa87310b7d..bed5cc2b5a0bf752f7906e8d5dcf60a5cc461447 100644
--- a/data/json/SpellDefinition/411.json
+++ b/data/json/SpellDefinition/411.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 411,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -76,21 +77,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/41162.json b/data/json/SpellDefinition/41162.json
index c0053a85e969e5eeb0f5c43234f60f695e5f17b7..5f609cb96df897efdc6a42649a9f5a291aa429d1 100644
--- a/data/json/SpellDefinition/41162.json
+++ b/data/json/SpellDefinition/41162.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 41162,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -64,30 +65,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 11.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 14.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 8.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/412.json b/data/json/SpellDefinition/412.json
index 1d935d35dae816f7297e0c7530e78c506ffebafe..e94b81a20457b4c0199272efccaf2ee0f4844151 100644
--- a/data/json/SpellDefinition/412.json
+++ b/data/json/SpellDefinition/412.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 412,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -89,21 +90,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 19.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/4133.json b/data/json/SpellDefinition/4133.json
index e6b4b111df02914c409e5ce7b2f9d2b0cee8b808..98444397b6baefe5f409342f785ee5d564c0614c 100644
--- a/data/json/SpellDefinition/4133.json
+++ b/data/json/SpellDefinition/4133.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 4133,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/414.json b/data/json/SpellDefinition/414.json
index 87e1fd1c071857430aa72ff52c45a21ecec7b4b0..8b7dece097339b81744c814518736c9ed5fb544f 100644
--- a/data/json/SpellDefinition/414.json
+++ b/data/json/SpellDefinition/414.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 414,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/415.json b/data/json/SpellDefinition/415.json
index 162b1b8467d583e8d54fffbdb605a070178cf2e5..abd37a5178a56b0c9f2de5311d473461a4354a47 100644
--- a/data/json/SpellDefinition/415.json
+++ b/data/json/SpellDefinition/415.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 415,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/41503.json b/data/json/SpellDefinition/41503.json
index 95f265d2c2aa7d390e5542738b95b77e8bd508d5..c5876437b468dc5d7f9f2fd4c89e83b909c8399e 100644
--- a/data/json/SpellDefinition/41503.json
+++ b/data/json/SpellDefinition/41503.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 41503,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -88,21 +89,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 15.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 18.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/41531.json b/data/json/SpellDefinition/41531.json
index a2b24cc888d1c2e1eb9bff5bb80c95083040b675..43b8ce5143247388ff33a06acddb10d02a6763ae 100644
--- a/data/json/SpellDefinition/41531.json
+++ b/data/json/SpellDefinition/41531.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 41531,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -135,21 +136,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 22.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 27.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/418.json b/data/json/SpellDefinition/418.json
index 9c7c7f09db8cc74092f7862a921c341db393c2a0..a9bd94663f0cc2c903ecf2e276a76e3d9a3c4cdc 100644
--- a/data/json/SpellDefinition/418.json
+++ b/data/json/SpellDefinition/418.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 418,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -41,48 +48,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -137,7 +119,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "GEMME - SET - DRACONIQUE - [AIR] Souffle Draconique",
diff --git a/data/json/SpellDefinition/419.json b/data/json/SpellDefinition/419.json
index 8e054845249624a7b049ef74a6f211e420bfa689..6c7d6e95b5d8c1aea21ef83f1ddaf03241670df6 100644
--- a/data/json/SpellDefinition/419.json
+++ b/data/json/SpellDefinition/419.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 419,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -81,6 +82,6 @@
   "m_i18nNameId": 51085,
   "m_i18nDescriptionId": 42731,
   "m_elementaryStates": 1,
-  "assetGuid": "15874220b9a681747867661bb514f555",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/420.json b/data/json/SpellDefinition/420.json
index 2f3fe2fad8650e1a9c74ef17febeadd2fd1e3f43..054863d3bc2891eec2f292c0c739a3d24d6e5637 100644
--- a/data/json/SpellDefinition/420.json
+++ b/data/json/SpellDefinition/420.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 420,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/421.json b/data/json/SpellDefinition/421.json
index ce1ba0358e107d9c4eeacc9dc862c4e8fade2732..7fb4846f48123742fb91e068b12d75b42c50bb15 100644
--- a/data/json/SpellDefinition/421.json
+++ b/data/json/SpellDefinition/421.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 421,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/422.json b/data/json/SpellDefinition/422.json
index ddce3fbe610168df2719e2864744ca503fab1df5..e9e4fd21cb5efe3a1bfcae8cfb90d324398e4ae9 100644
--- a/data/json/SpellDefinition/422.json
+++ b/data/json/SpellDefinition/422.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 422,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/42235.json b/data/json/SpellDefinition/42235.json
index 855d139558627248551c94126d136c80af99610a..302bd546ff7f7bff3a7f101060c891d7961e1df8 100644
--- a/data/json/SpellDefinition/42235.json
+++ b/data/json/SpellDefinition/42235.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 42235,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/423.json b/data/json/SpellDefinition/423.json
index b4d7d151957b2088b485f9651ddb17e230e9e2a1..d8ac66b38727b90099339f94248dc03ac01832f2 100644
--- a/data/json/SpellDefinition/423.json
+++ b/data/json/SpellDefinition/423.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 423,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,6 +53,6 @@
   "m_i18nNameId": 83843,
   "m_i18nDescriptionId": 65229,
   "m_elementaryStates": 1,
-  "assetGuid": "e8e35fe3e74833d4c89be18eac2e0d62",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/42326.json b/data/json/SpellDefinition/42326.json
index a0607625b3038841cc36a02fa8410025bafce460..f91df2d7bee1baf6df2dace68e9ff7dfe41207ab 100644
--- a/data/json/SpellDefinition/42326.json
+++ b/data/json/SpellDefinition/42326.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 42326,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/425.json b/data/json/SpellDefinition/425.json
index 0648eb6d5f2183c1656eaa01db90e0ff0e01f882..5cc87143890e1b9afc8d16cd8abc99bab0deb02b 100644
--- a/data/json/SpellDefinition/425.json
+++ b/data/json/SpellDefinition/425.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 425,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/42587.json b/data/json/SpellDefinition/42587.json
index 724ab6035ef9c8af1e2dfeedc1c176053c2b7044..1604e0e78e80ab968d7b2e12e168010a5ffdb253 100644
--- a/data/json/SpellDefinition/42587.json
+++ b/data/json/SpellDefinition/42587.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 42587,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,7 +62,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "ADJACENT"
+        "ADJACENT",
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/426.json b/data/json/SpellDefinition/426.json
index d9d591bc968ec654732472bab23ef97d4253e41e..c8c0fcd2cf4dccd49a927590e326343e0902fe98 100644
--- a/data/json/SpellDefinition/426.json
+++ b/data/json/SpellDefinition/426.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 426,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -34,6 +35,16 @@
         }
       }
     ],
+    "castCondition": {
+      "type": "UniqueForCasterTeamCondition",
+      "specificEntity": {
+        "type": "SummoningDefinitionFilter",
+        "condition": 1,
+        "summonings": [
+          236
+        ]
+      }
+    },
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
@@ -59,7 +70,15 @@
         ]
       }
     },
-    "spellEffectData": [],
+    "spellEffectData": [
+      {
+        "type": "SpellEffectInstantiationData",
+        "spellEffect": "0d9700b5de820314f8d2e3ddf4fdbb9d",
+        "originTarget": {
+          "type": "FirstCastTargetSelector"
+        }
+      }
+    ],
     "eventsInvalidatingCost": [
       2
     ],
@@ -85,7 +104,7 @@
       "hasEffects": true,
       "keywordReferences": [
         "LIGHTNING",
-        "PHASE",
+        "UNIQUE",
         {
           "type": 4,
           "id": 236
diff --git a/data/json/SpellDefinition/427.json b/data/json/SpellDefinition/427.json
index aecf1855701a0e42bb1b48fef93facf19074e7ea..bb4ec3f3ad0d1a0151dc0276ac3e98dbf7300705 100644
--- a/data/json/SpellDefinition/427.json
+++ b/data/json/SpellDefinition/427.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 427,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/428.json b/data/json/SpellDefinition/428.json
index 5c108afd6a5ab061b18cdd815ba4a40b94178820..36b88f707f2aa8699342f5608d01632e08939a3c 100644
--- a/data/json/SpellDefinition/428.json
+++ b/data/json/SpellDefinition/428.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 428,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/429.json b/data/json/SpellDefinition/429.json
index d54cef83474705415432bf30284cdc1a57317194..0d8eed734a324f4e8dcdd433550fd29dab7fbce8 100644
--- a/data/json/SpellDefinition/429.json
+++ b/data/json/SpellDefinition/429.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 429,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/42969.json b/data/json/SpellDefinition/42969.json
index d8c25ef481ba7c9679c08031099053d36fe452e4..d4a4811a65691342dc36194c8f09667b2ba50e82 100644
--- a/data/json/SpellDefinition/42969.json
+++ b/data/json/SpellDefinition/42969.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 42969,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -64,21 +65,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 16.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 20.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/43.json b/data/json/SpellDefinition/43.json
index ad1c3824211462eb2f634d1baac3e9d8e4bd86de..2cf602b2c52caaeeb9fa03e3d322859cd44e0b43 100644
--- a/data/json/SpellDefinition/43.json
+++ b/data/json/SpellDefinition/43.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 43,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/430.json b/data/json/SpellDefinition/430.json
index bfdfd932c6971079e372b3b8963164e221e80c78..ebf8609fe1edc66c4e27874651bae2afa856f87a 100644
--- a/data/json/SpellDefinition/430.json
+++ b/data/json/SpellDefinition/430.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 430,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/43054.json b/data/json/SpellDefinition/43054.json
index 1fb242c88fd5b2e2c7c944cce9a6ebc1753a27a6..8460a35e4581083589869221617214a017ef06d3 100644
--- a/data/json/SpellDefinition/43054.json
+++ b/data/json/SpellDefinition/43054.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 43054,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,13 +53,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.1,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/431.json b/data/json/SpellDefinition/431.json
index be3aa4a1c8c99eea3a1883f477231214f51f1838..63de13e7c008ab0b4810e87d65bd58d0a99fab31 100644
--- a/data/json/SpellDefinition/431.json
+++ b/data/json/SpellDefinition/431.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 431,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/432.json b/data/json/SpellDefinition/432.json
index d60f666b2843c760edaae893057dab868eacef1a..9a88b923355ac9e8a533d5be441809d92c4f093a 100644
--- a/data/json/SpellDefinition/432.json
+++ b/data/json/SpellDefinition/432.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 432,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/434.json b/data/json/SpellDefinition/434.json
index 9e4a6b404f52ba30cdbbdc20733f9793a538553e..086f57c96ace0f6c67be9bd310f908caa1e1314b 100644
--- a/data/json/SpellDefinition/434.json
+++ b/data/json/SpellDefinition/434.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 434,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
diff --git a/data/json/SpellDefinition/43594.json b/data/json/SpellDefinition/43594.json
index dc949738b098f3f0f8647160a8443d725f7114cc..c5006b79d28bf8dea8161458dcc3780529914f39 100644
--- a/data/json/SpellDefinition/43594.json
+++ b/data/json/SpellDefinition/43594.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 43594,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/436.json b/data/json/SpellDefinition/436.json
index 78a38fca66ec25720a0b368b8ee328011e4f9fdf..2ed0bcba6fc9e5210a35f9a8eca0286d097754e0 100644
--- a/data/json/SpellDefinition/436.json
+++ b/data/json/SpellDefinition/436.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 436,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/437.json b/data/json/SpellDefinition/437.json
index f7ff2bf25b4020a4bc6f5a4a11f8a1ce56607fad..863bfc8f97aad705e93dc8e5542ccdbf918cb305 100644
--- a/data/json/SpellDefinition/437.json
+++ b/data/json/SpellDefinition/437.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 437,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/43725.json b/data/json/SpellDefinition/43725.json
index 3e6b290d244f8b995bf4f59a3aebb829015711dc..60800b8501bdcb7f5575bd7c1d648a5bb8899ea8 100644
--- a/data/json/SpellDefinition/43725.json
+++ b/data/json/SpellDefinition/43725.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 43725,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/438.json b/data/json/SpellDefinition/438.json
index ee6ba507b031b66568805479c26e392f2c3dfca9..95bd0100dadd179e76ffabdcde6af65135077c6b 100644
--- a/data/json/SpellDefinition/438.json
+++ b/data/json/SpellDefinition/438.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 438,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/43877.json b/data/json/SpellDefinition/43877.json
index 3ac1c5addd40f3c99c7c7d04e296892e7326b5c7..41106c8631a4ce918105c0e965e9e92f3831a9ea 100644
--- a/data/json/SpellDefinition/43877.json
+++ b/data/json/SpellDefinition/43877.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 43877,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,30 +64,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 16.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 20.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 9.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/439.json b/data/json/SpellDefinition/439.json
index e89a3ef7d5a6ac034d33e3690336dfce97facac8..b5aba2fede23b6ef34fe827d69f7382710d328ea 100644
--- a/data/json/SpellDefinition/439.json
+++ b/data/json/SpellDefinition/439.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 439,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/44.json b/data/json/SpellDefinition/44.json
index 95a7eebb9fbf50488b1b59aad7d1ae9b707d8be4..c51cc0236655b78b69f9196d42ce2a59309b872a 100644
--- a/data/json/SpellDefinition/44.json
+++ b/data/json/SpellDefinition/44.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 44,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/440.json b/data/json/SpellDefinition/440.json
index d3b22504f9b0c1849db74f20d70146e4d2651bd0..c8eb9c04fbea110f8e216572a8c15563aabaec38 100644
--- a/data/json/SpellDefinition/440.json
+++ b/data/json/SpellDefinition/440.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 440,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -39,48 +46,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -115,7 +97,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 13
+          "value": 12
         },
         {
           "type": "SpellsCountValue",
@@ -145,7 +127,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "GEMME - SET - DÉCHAÎNÉ - Souffle Déchaîné",
diff --git a/data/json/SpellDefinition/442.json b/data/json/SpellDefinition/442.json
index f14e26782784d6f27f2f2c4c1338cedb61843c89..9ace5627f7052506fdbfc51fe7ca241efd5cac54 100644
--- a/data/json/SpellDefinition/442.json
+++ b/data/json/SpellDefinition/442.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 442,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/44288.json b/data/json/SpellDefinition/44288.json
index 2b43929298160e320b6bf39eae4eaf512a136dc4..2f6a997921736e04a105263a39dc32d7d5595c5e 100644
--- a/data/json/SpellDefinition/44288.json
+++ b/data/json/SpellDefinition/44288.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 44288,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,30 +56,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 9.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 11.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 9.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/443.json b/data/json/SpellDefinition/443.json
index 0f442b46a8cfaf36f6922051c7d2335e00b77c3b..3ba52de8c3407407aec00de42f35365c8212076d 100644
--- a/data/json/SpellDefinition/443.json
+++ b/data/json/SpellDefinition/443.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 443,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/444.json b/data/json/SpellDefinition/444.json
index 3bc7a984d0b3ea9c68c3421b58f81a1c7033efa6..5a466800819cf1117f6923c27128ef5c61cc0b47 100644
--- a/data/json/SpellDefinition/444.json
+++ b/data/json/SpellDefinition/444.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 444,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,21 +57,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 13.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/445.json b/data/json/SpellDefinition/445.json
index bfe3ee57d22fb1bbea21482758a9d3e4c3c193e9..eb50b6debc1d0660dd8cb18a6bb10ed71976a772 100644
--- a/data/json/SpellDefinition/445.json
+++ b/data/json/SpellDefinition/445.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 445,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 23
+          "value": 21
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "SACRIEUR - Frappe Cyclone",
diff --git a/data/json/SpellDefinition/446.json b/data/json/SpellDefinition/446.json
index d948c44330b6ecc5631e1d853923f05b5db08559..d5ea9a3a6b31c3b503bac52ca3dcaac96f58283b 100644
--- a/data/json/SpellDefinition/446.json
+++ b/data/json/SpellDefinition/446.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 446,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/447.json b/data/json/SpellDefinition/447.json
index 31940693ed708548c37b299365361d01cc6e71d9..0420e06d9cab2392ef92201e275beee821db6afd 100644
--- a/data/json/SpellDefinition/447.json
+++ b/data/json/SpellDefinition/447.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 447,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,30 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 9.55,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 11.65,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -96,7 +88,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "COLLISION"
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/448.json b/data/json/SpellDefinition/448.json
index d0f888abb42e87802d87ac7967e90ad8dc28f702..005c464929c4e448cf78d7db73a1273e3e0e871d 100644
--- a/data/json/SpellDefinition/448.json
+++ b/data/json/SpellDefinition/448.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 448,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/45.json b/data/json/SpellDefinition/45.json
index 06b7cdb87f0a1e9b3b1173d2d260e35f3017eef9..a14c35e531f2d3daaeb1dce5be8237cc47c66de1 100644
--- a/data/json/SpellDefinition/45.json
+++ b/data/json/SpellDefinition/45.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 45,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/450.json b/data/json/SpellDefinition/450.json
index 4d79a5aa752105c183a1f4689e8c953406d399f1..89d9d67b66152b9ed2216276a3815731889ef070 100644
--- a/data/json/SpellDefinition/450.json
+++ b/data/json/SpellDefinition/450.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 450,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -104,13 +105,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 15.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 60
         },
         {
           "type": "ConstIntegerValue",
@@ -134,6 +131,6 @@
   "m_i18nNameId": 75813,
   "m_i18nDescriptionId": 17506,
   "m_elementaryStates": 1,
-  "assetGuid": "46fce64b8593ccc4fbd98271df06fc76",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/45080.json b/data/json/SpellDefinition/45080.json
index 90ffe02d8f5711b829a3e8e0fd9bebd827df5a1b..3e302a375cb29fad2a682ddde71b3d6a18871378 100644
--- a/data/json/SpellDefinition/45080.json
+++ b/data/json/SpellDefinition/45080.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 45080,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -66,21 +67,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 10.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 13.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/451.json b/data/json/SpellDefinition/451.json
index 0fd4476588ee9dcba45858d03160b7c5cf041691..968c80ea5dd90ef43974b7a73e3b30ba011b83c5 100644
--- a/data/json/SpellDefinition/451.json
+++ b/data/json/SpellDefinition/451.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 451,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/4541.json b/data/json/SpellDefinition/4541.json
index 088b5453f40b6d326e18265351ec8002e65cdf53..69778f49c8a2e62c1beb053692eb04a115120b3b 100644
--- a/data/json/SpellDefinition/4541.json
+++ b/data/json/SpellDefinition/4541.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 4541,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/45474.json b/data/json/SpellDefinition/45474.json
index 2c3fbb59b26c81ba194a3cf1148bf7cd150cd8f6..e42cfb0cdcd8a579f81d5f1da210fa8085c537ab 100644
--- a/data/json/SpellDefinition/45474.json
+++ b/data/json/SpellDefinition/45474.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 45474,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -94,21 +95,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 15.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 19.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -119,7 +120,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "FEATHERED"
+        "FEATHERED",
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/455.json b/data/json/SpellDefinition/455.json
index 097d0179275e075deb4667f12113756fae453b6b..9d63f58b6ce564f7c8fd60ba546206e03c57ef47 100644
--- a/data/json/SpellDefinition/455.json
+++ b/data/json/SpellDefinition/455.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 455,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/458.json b/data/json/SpellDefinition/458.json
index 34456d62ff679345b11760a229a1aaba998ce465..ed0ed7c2623d673838e912dd99ab8c32ec12253f 100644
--- a/data/json/SpellDefinition/458.json
+++ b/data/json/SpellDefinition/458.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 458,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/45858.json b/data/json/SpellDefinition/45858.json
index f958a10b6e394c47b0d4e596869c3d2ebf9c5f7f..613b33d36135b711384981137b52f715b5163592 100644
--- a/data/json/SpellDefinition/45858.json
+++ b/data/json/SpellDefinition/45858.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 45858,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/459.json b/data/json/SpellDefinition/459.json
index 3e11c58c8675038aa6a5ffc58bb16b793ca3ecb7..66d93f2f57a29571ccee5fc4f1c15878d96d5ef8 100644
--- a/data/json/SpellDefinition/459.json
+++ b/data/json/SpellDefinition/459.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 459,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/460.json b/data/json/SpellDefinition/460.json
index babbd59a939020a5749a98e3a87bc227dc445d03..ff91d799080a776088f1cd60fc9f4cc78c813835 100644
--- a/data/json/SpellDefinition/460.json
+++ b/data/json/SpellDefinition/460.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 460,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/461.json b/data/json/SpellDefinition/461.json
index e60fbdc1fa2ac22753b1e6df77d9bd68826b5f19..c6593b5a022890a21378d527be55715ca0ac58cf 100644
--- a/data/json/SpellDefinition/461.json
+++ b/data/json/SpellDefinition/461.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 461,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 18.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/462.json b/data/json/SpellDefinition/462.json
index fa0671c190af02e78039eebbe09ebb303e217b30..29737653fe7cf37883c0871db5fd637da5457037 100644
--- a/data/json/SpellDefinition/462.json
+++ b/data/json/SpellDefinition/462.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 462,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/463.json b/data/json/SpellDefinition/463.json
index b87be57094aaa5cbc516ce1edc3a757acd2ad29b..fe2a99295765e7c30193b60c844d21eae5adbc26 100644
--- a/data/json/SpellDefinition/463.json
+++ b/data/json/SpellDefinition/463.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 463,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -84,6 +85,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         {
           "type": 25,
           "id": 711
diff --git a/data/json/SpellDefinition/464.json b/data/json/SpellDefinition/464.json
index a65e566ad844cbd7de0a9a986d02d566ba5e8bd4..5fad870c0d645a043e606532c0d9baf85ad9ae43 100644
--- a/data/json/SpellDefinition/464.json
+++ b/data/json/SpellDefinition/464.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 464,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -89,12 +90,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 9.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/4640.json b/data/json/SpellDefinition/4640.json
index acd44fcd37d3acf5f0dfd435f91cd22981e53add..66d6c5f267819c81f75a05fde28826715590d898 100644
--- a/data/json/SpellDefinition/4640.json
+++ b/data/json/SpellDefinition/4640.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 4640,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        8
+        8,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/46444.json b/data/json/SpellDefinition/46444.json
index 26ed326d9e24e9758a80355b363eb19dc7ae2230..055e67f1377df41c5d6612cc2d083215e51b766f 100644
--- a/data/json/SpellDefinition/46444.json
+++ b/data/json/SpellDefinition/46444.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 46444,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -94,21 +95,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 8.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 10.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/466.json b/data/json/SpellDefinition/466.json
index 6d42444565ac7d0830922c6ee74739a12d99abd1..5c9280c58fd64b0309bcd04dfeb4175704018526 100644
--- a/data/json/SpellDefinition/466.json
+++ b/data/json/SpellDefinition/466.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 466,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         2
       ]
diff --git a/data/json/SpellDefinition/467.json b/data/json/SpellDefinition/467.json
index 4055208918341bb08373370ff4e366e60ba9f7d0..0e583f716b55735967e4038744456e6c55ed1c22 100644
--- a/data/json/SpellDefinition/467.json
+++ b/data/json/SpellDefinition/467.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 467,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 23.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/468.json b/data/json/SpellDefinition/468.json
index 55284686d10e1c61655352988cb12c5b420282f4..64b96a441bf180559c1164748812f2aee214d360 100644
--- a/data/json/SpellDefinition/468.json
+++ b/data/json/SpellDefinition/468.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 468,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        1
+        1,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/469.json b/data/json/SpellDefinition/469.json
index 687ce2b3f79f8cd8f29e8b175b003fd31b985d3a..78822cf8915baa87351d489d38ab7d62c62a4e1e 100644
--- a/data/json/SpellDefinition/469.json
+++ b/data/json/SpellDefinition/469.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 469,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/46954.json b/data/json/SpellDefinition/46954.json
index d900261d3850e1b7d933857c7d3cd3ae4cffdcc2..32275e47e50492d3d8f5f8b8f56347e510dce75a 100644
--- a/data/json/SpellDefinition/46954.json
+++ b/data/json/SpellDefinition/46954.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 46954,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 12.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/47.json b/data/json/SpellDefinition/47.json
index 502c0887e018f03780c5d1a9812816603bbc5607..750faaf4c407a0d74f4f7f014b04273d804b2b88 100644
--- a/data/json/SpellDefinition/47.json
+++ b/data/json/SpellDefinition/47.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 47,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -60,21 +61,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 17.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/471.json b/data/json/SpellDefinition/471.json
index d0e4059acafdf1335e0ff917c0252a400f5c3582..3918036ed528fc813dbda854a2b72bcd587f5a46 100644
--- a/data/json/SpellDefinition/471.json
+++ b/data/json/SpellDefinition/471.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 471,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/472.json b/data/json/SpellDefinition/472.json
index 1f18a7fb0941fe80794df1749177d910667b9d4c..bd763217683008ed28fba9a63dbe0112ed70171b 100644
--- a/data/json/SpellDefinition/472.json
+++ b/data/json/SpellDefinition/472.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 472,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/473.json b/data/json/SpellDefinition/473.json
index 5861c2b424d76257c3b3367453ed936799ded79e..15aa1678fbf24083600bd30db884838e8db0972e 100644
--- a/data/json/SpellDefinition/473.json
+++ b/data/json/SpellDefinition/473.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 473,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/47326.json b/data/json/SpellDefinition/47326.json
index 58e1c0afe4db2110f78c00ca354faa7da142cebf..1903766940b834cb876405c6093f9c5bf1c35983 100644
--- a/data/json/SpellDefinition/47326.json
+++ b/data/json/SpellDefinition/47326.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 47326,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -71,6 +72,6 @@
   "m_i18nNameId": 33809,
   "m_i18nDescriptionId": 54992,
   "m_elementaryStates": 1,
-  "assetGuid": "6beab3e65eb060149ab6a66e7b79ab3f",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/474.json b/data/json/SpellDefinition/474.json
index e1acc9d2446f14b984d64faa24ef740ed062abbf..a86f811bf957b2f52a622b6d5abfd0b6dc975d18 100644
--- a/data/json/SpellDefinition/474.json
+++ b/data/json/SpellDefinition/474.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 474,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/475.json b/data/json/SpellDefinition/475.json
index e9592dff99bc12e2651aefacd3a338b090248652..5f4c6360ca988d51e58406b1b8c04dfca410016e 100644
--- a/data/json/SpellDefinition/475.json
+++ b/data/json/SpellDefinition/475.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 475,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/476.json b/data/json/SpellDefinition/476.json
index 3ed5d2ffd20b745578c9b2dff1e10bfc70e41f46..b5597b81ab7248085bc6b1861776fcd9d744d22f 100644
--- a/data/json/SpellDefinition/476.json
+++ b/data/json/SpellDefinition/476.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 476,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/479.json b/data/json/SpellDefinition/479.json
index a09f7b457b004baf5956fd23b9f302a1b1dfa450..5cd1e39e73624ef8b4d17cee3c8d343787162ef6 100644
--- a/data/json/SpellDefinition/479.json
+++ b/data/json/SpellDefinition/479.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 479,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/48.json b/data/json/SpellDefinition/48.json
index 75c43df6b0b064c31384a0ad890d7cbc3cc148bb..39fdbdabd6ad35e528171799d47e7d05f810126a 100644
--- a/data/json/SpellDefinition/48.json
+++ b/data/json/SpellDefinition/48.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": false,
       "families": [
-        1
+        1,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/480.json b/data/json/SpellDefinition/480.json
index ec0b8528a278a9400cfe401ec92eb8dfd061533c..6a37f7301edad6967202452d6099a2d8a24f0f9b 100644
--- a/data/json/SpellDefinition/480.json
+++ b/data/json/SpellDefinition/480.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 480,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 23.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/48065.json b/data/json/SpellDefinition/48065.json
index 11b207f5152caff7428323025662ce63928bf329..109942055d25816470d7149f0aaaefdfce9a4fd8 100644
--- a/data/json/SpellDefinition/48065.json
+++ b/data/json/SpellDefinition/48065.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48065,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 25.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/48111.json b/data/json/SpellDefinition/48111.json
index 78ab3e4019905d97d1768eb971ab30813d266ab4..b25a22e431909c532063047893e903fdebe2cd2a 100644
--- a/data/json/SpellDefinition/48111.json
+++ b/data/json/SpellDefinition/48111.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48111,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/482.json b/data/json/SpellDefinition/482.json
index da05e321c7bf43a8e446d6c04b3081a5595a2343..99fd581bcf5b874c8b678a7437d4eb7c7f45835c 100644
--- a/data/json/SpellDefinition/482.json
+++ b/data/json/SpellDefinition/482.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 482,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/483.json b/data/json/SpellDefinition/483.json
index 90e671416683495177463daea5641363bfeb3530..025e04ff5d95b54ac4772340e8100901e388cfa1 100644
--- a/data/json/SpellDefinition/483.json
+++ b/data/json/SpellDefinition/483.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 483,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/484.json b/data/json/SpellDefinition/484.json
index 9f973789a7782c24db26cc30b084e87d1169faf2..89a0182ce40839f885a78c5b9b8d6edb67aac971 100644
--- a/data/json/SpellDefinition/484.json
+++ b/data/json/SpellDefinition/484.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 484,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/48531.json b/data/json/SpellDefinition/48531.json
index f727abea3db08f025b0db10eeb14a067f0686f20..acbf62dfe7bb3e3aa5c2dd960191e08f3b5115f3 100644
--- a/data/json/SpellDefinition/48531.json
+++ b/data/json/SpellDefinition/48531.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48531,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,31 +55,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": -5.6,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": -25
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/48718.json b/data/json/SpellDefinition/48718.json
index 4f93ca3ca8130e07bfac497646ce184c2076d700..fc2885e5b79f23417300034246465a9b017938c6 100644
--- a/data/json/SpellDefinition/48718.json
+++ b/data/json/SpellDefinition/48718.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48718,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,12 +62,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmgC",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/48720.json b/data/json/SpellDefinition/48720.json
index 2ddad064be763b33fb0aeaf043c5d676974b05b3..d5df2798fa71b48e35f74ed939341b18ecb8c29e 100644
--- a/data/json/SpellDefinition/48720.json
+++ b/data/json/SpellDefinition/48720.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48720,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/48779.json b/data/json/SpellDefinition/48779.json
index 47af6cc9cdfa4a0a390d1bdcf315e760c124945c..d33bae8de9df42433b6cc65fa4fb22cfc2ec4a1b 100644
--- a/data/json/SpellDefinition/48779.json
+++ b/data/json/SpellDefinition/48779.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 48779,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -60,39 +61,26 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min1",
-          "baseValue": 6.6,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "max1",
-          "baseValue": 9.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 40
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min2",
           "baseValue": 13.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max2",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/489.json b/data/json/SpellDefinition/489.json
index 0285755fa0312f8df0ee05b9e8ba1083ee171f63..bcb4744658642749a93a0bf4b947f52831055ab1 100644
--- a/data/json/SpellDefinition/489.json
+++ b/data/json/SpellDefinition/489.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 489,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        11
+        11,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/49.json b/data/json/SpellDefinition/49.json
index 68e881a38465a272bce84eb8f1c5817760253402..07bd3028f4e0028d690524315a73a822ad149370 100644
--- a/data/json/SpellDefinition/49.json
+++ b/data/json/SpellDefinition/49.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 49,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/490.json b/data/json/SpellDefinition/490.json
index 23d709e8fe92c2e2333b3af844199751c4adcfff..72c52d56e58beb15bbabc2d5946a87ea158558eb 100644
--- a/data/json/SpellDefinition/490.json
+++ b/data/json/SpellDefinition/490.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 490,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/49095.json b/data/json/SpellDefinition/49095.json
index 974c77504c76e775484481bb56fd222ea3ecbfb7..e76af9514cfacccb6c85f1705a9544f4275e2e37 100644
--- a/data/json/SpellDefinition/49095.json
+++ b/data/json/SpellDefinition/49095.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 49095,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/49097.json b/data/json/SpellDefinition/49097.json
index 8147c96f059f195ce543ed3f0a08cac0423ff355..22055b2d11d71303c830c07b5cbaccc2a46fe577 100644
--- a/data/json/SpellDefinition/49097.json
+++ b/data/json/SpellDefinition/49097.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 49097,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -59,21 +60,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 0
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 0
           }
         }
       ],
diff --git a/data/json/SpellDefinition/491.json b/data/json/SpellDefinition/491.json
index 01c3ae2e7e70bef278d29597180ed5d34cbf3320..3423a10aa567ab64ccf3b76c1a0162d0bea89813 100644
--- a/data/json/SpellDefinition/491.json
+++ b/data/json/SpellDefinition/491.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 491,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/492.json b/data/json/SpellDefinition/492.json
index 79bb2e6a1150c166294a289041ad4492c7a7839d..be30292a6f763c316598a9de9bcc24278437ec85 100644
--- a/data/json/SpellDefinition/492.json
+++ b/data/json/SpellDefinition/492.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 492,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -129,21 +130,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 8.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/49241.json b/data/json/SpellDefinition/49241.json
index 87a80000aae007d74315d4ca9dae273afbc04aed..3d5f858ebc77ff2dde79ffa129bf4e4c20189f4e 100644
--- a/data/json/SpellDefinition/49241.json
+++ b/data/json/SpellDefinition/49241.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 49241,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/493.json b/data/json/SpellDefinition/493.json
index 8aac2c1a54c1535d596f646f1a1ff1206345690c..2f85c63538dd8ebf0048aa9c10556425df6f03e5 100644
--- a/data/json/SpellDefinition/493.json
+++ b/data/json/SpellDefinition/493.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 493,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/49682.json b/data/json/SpellDefinition/49682.json
index 04c6803b0e9afc38834ddb8ae307c301b887dc38..0a273cd37d152f8ac7770c421b5b0a0a99653589 100644
--- a/data/json/SpellDefinition/49682.json
+++ b/data/json/SpellDefinition/49682.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 49682,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -48,21 +49,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/497.json b/data/json/SpellDefinition/497.json
index 34b668f899a0be2f91578cb95d93767feddf4b84..94daf89c8a9734179258d1f5435759a7f6b5ef81 100644
--- a/data/json/SpellDefinition/497.json
+++ b/data/json/SpellDefinition/497.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 497,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -64,7 +65,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE BWORK - Séisme",
diff --git a/data/json/SpellDefinition/498.json b/data/json/SpellDefinition/498.json
index 5666477ecfdaafd4f3f8844b5ac3e0f14b96fe2f..7d451d7431bb01a63fdec133a9b307d1f4fe0574 100644
--- a/data/json/SpellDefinition/498.json
+++ b/data/json/SpellDefinition/498.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 498,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/499.json b/data/json/SpellDefinition/499.json
index 777906d45dfc935fb3fea1023c3cf373e9cefcf6..14827e3c3b4bbeba8000ebaafb3a23a89144ddd1 100644
--- a/data/json/SpellDefinition/499.json
+++ b/data/json/SpellDefinition/499.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 499,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/5.json b/data/json/SpellDefinition/5.json
index cc15a4e484e64b3974122b839fc3ea0bec220b9f..348f12f3243e47881dede5e43fbe3f6ec4276fbe 100644
--- a/data/json/SpellDefinition/5.json
+++ b/data/json/SpellDefinition/5.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 5,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/50.json b/data/json/SpellDefinition/50.json
index e0810930265e20d3bea20b3f3fa76506bfee5d90..fbb6b5867d23113fe4c106e0a5d6ff88dcf1e4fe 100644
--- a/data/json/SpellDefinition/50.json
+++ b/data/json/SpellDefinition/50.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 50,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 22.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 25.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/500.json b/data/json/SpellDefinition/500.json
index 82a42869d1feff1f0285e8dda037998bc4b8668d..5d174ec02a96b13b8e54d449222ae1da5ce2abee 100644
--- a/data/json/SpellDefinition/500.json
+++ b/data/json/SpellDefinition/500.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 500,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/50061.json b/data/json/SpellDefinition/50061.json
index 77fb2bcfa11412ee88cf799b57a7e62fb63c1c12..a765bdbb483f44e2441630caa5617d2da3e1e9b3 100644
--- a/data/json/SpellDefinition/50061.json
+++ b/data/json/SpellDefinition/50061.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 50061,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,21 +55,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/50174.json b/data/json/SpellDefinition/50174.json
index 17b3907be238c9533f288d6468e422ff7f5b0ae3..df18e6b873e5931e960b23731271ff930041f053 100644
--- a/data/json/SpellDefinition/50174.json
+++ b/data/json/SpellDefinition/50174.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 50174,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,7 +57,7 @@
               "type": "FirstCastTargetSelector"
             },
             "distance": {
-              "type": "GreaterThan",
+              "type": "GreaterEqualThan",
               "dynamicValue": {
                 "type": "ConstIntegerValue",
                 "referenceId": "",
@@ -91,21 +92,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 21.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
@@ -115,14 +116,15 @@
         {
           "type": 7,
           "id": 1607
-        }
+        },
+        "PUSH"
       ]
     }
   },
   "m_displayName": "MONSTRE CRAQUELEUR - Rock \u0027N\u0027 Roll",
   "m_availability": 2,
   "m_i18nNameId": 63416,
-  "m_i18nDescriptionId": 97167,
+  "m_i18nDescriptionId": 80736,
   "m_elementaryStates": 1,
   "assetGuid": "",
   "size": 0
diff --git a/data/json/SpellDefinition/502.json b/data/json/SpellDefinition/502.json
index e383abf0315e2207fa41f80f124d08867e5c385d..de3b449fc7785b2630c5731026762984ac9120c6 100644
--- a/data/json/SpellDefinition/502.json
+++ b/data/json/SpellDefinition/502.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 502,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": false,
-      "families": []
+      "families": [
+        73
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/503.json b/data/json/SpellDefinition/503.json
index bbcabbd66d48d1cd370ffd5a26e4784ded874675..2b31b32b9f8d17fc4adfec792ad812110f32f1b7 100644
--- a/data/json/SpellDefinition/503.json
+++ b/data/json/SpellDefinition/503.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 503,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/504.json b/data/json/SpellDefinition/504.json
index 1585383191fce593293bc32c3b5a2decc0c24b92..8c3dd949ed547e79a5965452f985f485bc97569a 100644
--- a/data/json/SpellDefinition/504.json
+++ b/data/json/SpellDefinition/504.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 504,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -44,21 +51,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/50420.json b/data/json/SpellDefinition/50420.json
index 57c681f2c2639e7297b576b0598b16f0490c8f6f..4101a7a82c5ebe18769c847728e2b97fcb22bbb9 100644
--- a/data/json/SpellDefinition/50420.json
+++ b/data/json/SpellDefinition/50420.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 50420,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -44,22 +45,14 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "AT",
-          "baseValue": 2.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 15
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "v",
-          "baseValue": 5.6,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/506.json b/data/json/SpellDefinition/506.json
index d83451dd312087f9c0bcbb38bc1dcb330797739d..d4be1ed34a39021689e8884966b3011ecd05ad36 100644
--- a/data/json/SpellDefinition/506.json
+++ b/data/json/SpellDefinition/506.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 506,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -47,21 +48,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/507.json b/data/json/SpellDefinition/507.json
index eff8e0ab0f7272f41212868d89e081298a63f6d7..74fbdfa5c65baa125a5438800de919a0a8c569e8 100644
--- a/data/json/SpellDefinition/507.json
+++ b/data/json/SpellDefinition/507.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 507,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/508.json b/data/json/SpellDefinition/508.json
index a6cc61e48086ad39a62da05acdf1e23882080b70..6819f27c193d7edf441c936c880fb5903ebf666b 100644
--- a/data/json/SpellDefinition/508.json
+++ b/data/json/SpellDefinition/508.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 508,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -66,7 +67,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 8
+          "value": 50
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/509.json b/data/json/SpellDefinition/509.json
index 91debd2f7bcfac0205e31f172e58c4491b67f464..b1a1d5c78a91aec768b9f3d21b93b73f1a793c50 100644
--- a/data/json/SpellDefinition/509.json
+++ b/data/json/SpellDefinition/509.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 509,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/51.json b/data/json/SpellDefinition/51.json
index ecbd5c43543998710627092227e50de63bae0936..f5ab940c32d29768db883806c267896cbbab617e 100644
--- a/data/json/SpellDefinition/51.json
+++ b/data/json/SpellDefinition/51.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 51,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 26.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/510.json b/data/json/SpellDefinition/510.json
index 1213b422f36d37b7dcbbfe42f69b6f8d235e62f0..0bc0ed0bcbdd95edf84ff599df77113e780ac46d 100644
--- a/data/json/SpellDefinition/510.json
+++ b/data/json/SpellDefinition/510.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 510,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/51057.json b/data/json/SpellDefinition/51057.json
index a46fdc65da91c2525b37cc3d73f756520552eb8f..8beddb9ca3485ff6cf7dce91570210ca476ff7c8 100644
--- a/data/json/SpellDefinition/51057.json
+++ b/data/json/SpellDefinition/51057.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 51057,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,39 +55,39 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 13.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ARmin",
           "baseValue": 6.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ARmax",
           "baseValue": 7.37,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/512.json b/data/json/SpellDefinition/512.json
index 827dbf5a805569a8be5b3f4a55a9dbd5942f4e0b..2efb900509609cb743fe4eb0908573a709111da9 100644
--- a/data/json/SpellDefinition/512.json
+++ b/data/json/SpellDefinition/512.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 512,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/514.json b/data/json/SpellDefinition/514.json
index 10c4b4c94c916a8acaa8bd9471be503a0fac07c1..d52328916f53746fa2126ffca3f1ebcf9e46c2dc 100644
--- a/data/json/SpellDefinition/514.json
+++ b/data/json/SpellDefinition/514.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 514,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -48,21 +49,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 16.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/515.json b/data/json/SpellDefinition/515.json
index c0c7b36bb9725be2170a1f6d314ea50b6b25c2ef..5b67f4f3b6bc6eff7c078ca5b3ac425449ecbe9f 100644
--- a/data/json/SpellDefinition/515.json
+++ b/data/json/SpellDefinition/515.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 515,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/516.json b/data/json/SpellDefinition/516.json
index 6b1cdd891b8caebf0843f65d331ed191873dfea8..9a6dbb4c9c183c19ddb4654d8bf42dc5ed944824 100644
--- a/data/json/SpellDefinition/516.json
+++ b/data/json/SpellDefinition/516.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 516,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "ENIRIPSA - Grande Fiole de Frayeur",
diff --git a/data/json/SpellDefinition/517.json b/data/json/SpellDefinition/517.json
index 3067123814b4f13b0027c78664546eb15dca1857..c7cd880d3956bb102ce29279ca8cbb7b4fab4324 100644
--- a/data/json/SpellDefinition/517.json
+++ b/data/json/SpellDefinition/517.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 517,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/518.json b/data/json/SpellDefinition/518.json
index 5b31a26fde98046107576ca8c8e72fccf437a8b7..0fc66d639bec4182b0b771a3f47da1a3aa1d3c9e 100644
--- a/data/json/SpellDefinition/518.json
+++ b/data/json/SpellDefinition/518.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 518,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -46,21 +47,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/51871.json b/data/json/SpellDefinition/51871.json
index 87b4717dd415f38f96b92c49408e45d709249cc7..2aa2d4b45de3aca7a08a3d8bc5cb7f048f9fe471 100644
--- a/data/json/SpellDefinition/51871.json
+++ b/data/json/SpellDefinition/51871.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 51871,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -44,21 +45,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/519.json b/data/json/SpellDefinition/519.json
index 4e537c8cb0e06d6e3fc0b420f854134ee1a1f794..277203303d6db2888e3d2e9b0f0ff855183fcc05 100644
--- a/data/json/SpellDefinition/519.json
+++ b/data/json/SpellDefinition/519.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 519,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/52.json b/data/json/SpellDefinition/52.json
index 1a5ad9ff229851edfa5b9fe565070368f741bbed..ffc786edfe87aaee27227e0f5e9b79bbba493bba 100644
--- a/data/json/SpellDefinition/52.json
+++ b/data/json/SpellDefinition/52.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/520.json b/data/json/SpellDefinition/520.json
index efdb8c2945ce404326513318f52a5113f67c516f..3a8ca165bb7ac49f13dcdb64117a2dfa1d6a5242 100644
--- a/data/json/SpellDefinition/520.json
+++ b/data/json/SpellDefinition/520.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 520,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -64,7 +65,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": -15
+          "value": -75
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/SpellDefinition/521.json b/data/json/SpellDefinition/521.json
index 0ffece39e66d28cce3abff8be64097fdca9ef4f2..71196573a3f59a78e765f819bbaa229e1163ade1 100644
--- a/data/json/SpellDefinition/521.json
+++ b/data/json/SpellDefinition/521.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 521,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/52115.json b/data/json/SpellDefinition/52115.json
index dd09c0d0ba52f218b835325366621715d2e373d8..d573a023d0ebf6cf5f1f170964b2749baefb3062 100644
--- a/data/json/SpellDefinition/52115.json
+++ b/data/json/SpellDefinition/52115.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52115,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -46,21 +47,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/52199.json b/data/json/SpellDefinition/52199.json
index 88f3820c8bdd6ad74dd290003ffb831074a41a32..f80a33aeb579d788f7afedbce110249ece74bd05 100644
--- a/data/json/SpellDefinition/52199.json
+++ b/data/json/SpellDefinition/52199.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52199,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/522.json b/data/json/SpellDefinition/522.json
index a0e70373e959577894c1a7f5c4072b931322e3a5..85ec17714aa47a841165ab53921e084491bf8ad3 100644
--- a/data/json/SpellDefinition/522.json
+++ b/data/json/SpellDefinition/522.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 522,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,21 +55,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 13.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/52313.json b/data/json/SpellDefinition/52313.json
index 75b250cb9d07cd439a61de438582878088309d44..96a35613299ab81db69406b544b42b92bb02a996 100644
--- a/data/json/SpellDefinition/52313.json
+++ b/data/json/SpellDefinition/52313.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52313,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -30,48 +31,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [],
@@ -92,21 +68,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -116,7 +92,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE ECAILLEUX - Lame de Fond",
diff --git a/data/json/SpellDefinition/524.json b/data/json/SpellDefinition/524.json
index d6cc7ce8798d2d6b723e784e18541824458a1267..8d12a03aedd6600b1a3177477983e1e7d8999713 100644
--- a/data/json/SpellDefinition/524.json
+++ b/data/json/SpellDefinition/524.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 524,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/52515.json b/data/json/SpellDefinition/52515.json
index a5aae9064c24c79d59749461c2965a5c5e59a5c0..cec45c43a6b33bd159ca8526bd2586de2f958312 100644
--- a/data/json/SpellDefinition/52515.json
+++ b/data/json/SpellDefinition/52515.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52515,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 16.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/52685.json b/data/json/SpellDefinition/52685.json
index 5e01eb4850cd69bba44724afdb67329e3a8d5a40..00cdbc1fb50c48f4504fc7d2f7a45a2f37b33f8e 100644
--- a/data/json/SpellDefinition/52685.json
+++ b/data/json/SpellDefinition/52685.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52685,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -111,21 +112,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 3.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 4.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/528.json b/data/json/SpellDefinition/528.json
index d8026ecefbbcf4d3d3ae895ecd2e814d1133dec5..e766c000faf5f4d0385ab544cd6e59ea9532313d 100644
--- a/data/json/SpellDefinition/528.json
+++ b/data/json/SpellDefinition/528.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 528,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/529.json b/data/json/SpellDefinition/529.json
index e6416ccfd52b3a167fd589de96a6d1403523c13d..d1456a6e4c347a9f3a821e1bc0dc8476cd71275a 100644
--- a/data/json/SpellDefinition/529.json
+++ b/data/json/SpellDefinition/529.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 529,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/52930.json b/data/json/SpellDefinition/52930.json
index 476d69c3bf5b01cc926adf7878211119db63b410..40d7f0077006a2d80c6f8a6278cbf780aef560d5 100644
--- a/data/json/SpellDefinition/52930.json
+++ b/data/json/SpellDefinition/52930.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 52930,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/530.json b/data/json/SpellDefinition/530.json
index 044c67c61c9b911394be5b210e384365818ad6af..ebf090935ee95ac94ff07a551dcf13c84eb3a2da 100644
--- a/data/json/SpellDefinition/530.json
+++ b/data/json/SpellDefinition/530.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 530,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/531.json b/data/json/SpellDefinition/531.json
index c414cb122977526adca82a4a2ad001c8859fa78b..9e90a7f530bacd263ed71cc997b26d16e188515b 100644
--- a/data/json/SpellDefinition/531.json
+++ b/data/json/SpellDefinition/531.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 531,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/53116.json b/data/json/SpellDefinition/53116.json
index 8397c18d12d7d419b7fe71c788fac4eacf1e86f6..203bc4b2ca7fc592d2d4f55d85c9f8f9de2f94c7 100644
--- a/data/json/SpellDefinition/53116.json
+++ b/data/json/SpellDefinition/53116.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 53116,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 14.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/532.json b/data/json/SpellDefinition/532.json
index 18fd0d38153c89bc9e1d1b72eb3e583e0250b088..9abacde4225c2bc396140045275512717f5bde3a 100644
--- a/data/json/SpellDefinition/532.json
+++ b/data/json/SpellDefinition/532.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 532,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,12 +53,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/533.json b/data/json/SpellDefinition/533.json
index 5c7a3f2440326699df5cbe8902c5b360e41f520f..9996659a635a42da3e4659aef853da800f387923 100644
--- a/data/json/SpellDefinition/533.json
+++ b/data/json/SpellDefinition/533.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 533,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/53357.json b/data/json/SpellDefinition/53357.json
index a62e39470412d5b54db03be5ae8ca13a910d9ab3..9aa74a5fa74dc9a10eedd37e457ab8a37b436924 100644
--- a/data/json/SpellDefinition/53357.json
+++ b/data/json/SpellDefinition/53357.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 53357,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/534.json b/data/json/SpellDefinition/534.json
index a8571420fafe25c5da917d637a0d7226f8875051..2ca91670aaa1becc0413fb2f4b6f5b961db4e2f6 100644
--- a/data/json/SpellDefinition/534.json
+++ b/data/json/SpellDefinition/534.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 534,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [],
     "costs": [
diff --git a/data/json/SpellDefinition/535.json b/data/json/SpellDefinition/535.json
index 61e41dafdbd42e8aecd5f4b64600a03803296a4c..260eb0a697c4d41580c840490b96495cca458a71 100644
--- a/data/json/SpellDefinition/535.json
+++ b/data/json/SpellDefinition/535.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 535,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/536.json b/data/json/SpellDefinition/536.json
index 0ccbca7ecad6f57c0d151cf78e101c468ab245c3..306034d90ab8f530c0d961f84b78f73c9ef4d750 100644
--- a/data/json/SpellDefinition/536.json
+++ b/data/json/SpellDefinition/536.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 536,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/53676.json b/data/json/SpellDefinition/53676.json
index 10fe793637153b5afa89e5dc4c1e26c36a8c0e18..f6fadccc1e16213b189d9304e2191af590873228 100644
--- a/data/json/SpellDefinition/53676.json
+++ b/data/json/SpellDefinition/53676.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 53676,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -65,21 +66,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/537.json b/data/json/SpellDefinition/537.json
index 7929595a35b5e62e58620495bfda328206b43df9..d35af8086933c2cee12cb33d1b100264e666fda2 100644
--- a/data/json/SpellDefinition/537.json
+++ b/data/json/SpellDefinition/537.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 537,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/538.json b/data/json/SpellDefinition/538.json
index ceeb4a0ff7d07d0beeae2bc31f3c7dee85cb31f9..b7a60869c8971f55bde34c3c96b110359671cbf0 100644
--- a/data/json/SpellDefinition/538.json
+++ b/data/json/SpellDefinition/538.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 538,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/539.json b/data/json/SpellDefinition/539.json
index f1e7862a5dbe7c5e9f3f107cfc2b7bd2291a93cb..054b7444e3581b5c0e4e450db02e9714addbc825 100644
--- a/data/json/SpellDefinition/539.json
+++ b/data/json/SpellDefinition/539.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 539,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/53919.json b/data/json/SpellDefinition/53919.json
index cf2380b346269060bdf92a35f7a7c39d198f8e59..9d68675a6fd165d431dfd931b05eff19b0951696 100644
--- a/data/json/SpellDefinition/53919.json
+++ b/data/json/SpellDefinition/53919.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 53919,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,31 +64,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 9.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 4.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/54.json b/data/json/SpellDefinition/54.json
index fde5f8b5f79c773f190ab3ade20a63061bcfd24f..36de4f14634308747f44da836a024a9c8d995757 100644
--- a/data/json/SpellDefinition/54.json
+++ b/data/json/SpellDefinition/54.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 54,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -76,21 +77,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 14.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/540.json b/data/json/SpellDefinition/540.json
index fd881e7a5ef8bbc70c57c8e8e4abb02393eeaec4..aa2572ded15e5fdb1287b5099e53d67379dea97e 100644
--- a/data/json/SpellDefinition/540.json
+++ b/data/json/SpellDefinition/540.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 540,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -81,21 +82,17 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "AT",
-          "baseValue": 4.1,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 20
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "AR",
           "baseValue": 13.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/542.json b/data/json/SpellDefinition/542.json
index 71cbd8e623f65ba385e028dd76def3d57673272e..562053e4dce6d4cbd00ac0174266c194ce190439 100644
--- a/data/json/SpellDefinition/542.json
+++ b/data/json/SpellDefinition/542.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 542,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/543.json b/data/json/SpellDefinition/543.json
index 8d58fcb7861836b062a16ce772a4bc74dfb906dc..bff4c2cb2029a3f541165e50883d570eac6fc3a2 100644
--- a/data/json/SpellDefinition/543.json
+++ b/data/json/SpellDefinition/543.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 543,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/544.json b/data/json/SpellDefinition/544.json
index 1baedc7edb64ac6dd11ed072a4c852abd7719f3c..61a646f9cc1221220c0f3a046bf3c34a5e40467c 100644
--- a/data/json/SpellDefinition/544.json
+++ b/data/json/SpellDefinition/544.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 544,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/54461.json b/data/json/SpellDefinition/54461.json
index 981d170bfa43165777a2a983e0a7f474ef9aa039..b2648b6ccf1779e285d2cfcae8248d4a09e12c2a 100644
--- a/data/json/SpellDefinition/54461.json
+++ b/data/json/SpellDefinition/54461.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 54461,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -44,21 +45,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 16.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 19.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/545.json b/data/json/SpellDefinition/545.json
index 6778adc8af81304df819a48bdf760e7aa2d252a7..8bafbc72fb77a3815c52970a3428c8159a9ce70d 100644
--- a/data/json/SpellDefinition/545.json
+++ b/data/json/SpellDefinition/545.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 545,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/54542.json b/data/json/SpellDefinition/54542.json
index 681840ce72a6b0196fa25dd68978b14ef65ed249..734278d9ea5d8ee002f0d679b5c445013d3cbd03 100644
--- a/data/json/SpellDefinition/54542.json
+++ b/data/json/SpellDefinition/54542.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 54542,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -57,21 +58,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/547.json b/data/json/SpellDefinition/547.json
index 3870afd3d31f537c39cfb553ad7eee761350d45c..b2e79b5b22bc5b51bc69f60753df39de841d587e 100644
--- a/data/json/SpellDefinition/547.json
+++ b/data/json/SpellDefinition/547.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 547,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/54766.json b/data/json/SpellDefinition/54766.json
index 126cdf06f46beaac94ad27a738307b1e58d021c9..f30b0f5099227053f5313c502292ebc03d839033 100644
--- a/data/json/SpellDefinition/54766.json
+++ b/data/json/SpellDefinition/54766.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 54766,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -64,12 +65,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/5477.json b/data/json/SpellDefinition/5477.json
index 632abe014cf915df37ca4e4b0015e0227c48a0e2..941a3a5edff3f6837d7c54e3f2fa35fc1d7cee4b 100644
--- a/data/json/SpellDefinition/5477.json
+++ b/data/json/SpellDefinition/5477.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 5477,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/548.json b/data/json/SpellDefinition/548.json
index 05f29a6d99abef1fc5e03ebfe1843078fe7812f4..ca7e0b57410ba1317b6c5e74cf31b797e57282ff 100644
--- a/data/json/SpellDefinition/548.json
+++ b/data/json/SpellDefinition/548.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 548,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/55.json b/data/json/SpellDefinition/55.json
index c15580a911fdf8cd37550b6edca38b06803c4675..7c469a8ad373ec2d8b8d776e0ecf72a5de2ab095 100644
--- a/data/json/SpellDefinition/55.json
+++ b/data/json/SpellDefinition/55.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,21 +44,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 13.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/551.json b/data/json/SpellDefinition/551.json
index 2217345620014298e5d00bd4a5132e99aba03e56..a371318742e125c96a3e8ab92e55047752bad5b4 100644
--- a/data/json/SpellDefinition/551.json
+++ b/data/json/SpellDefinition/551.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 551,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,13 +62,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.2,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 45
         }
       ],
       "hasEffects": true,
@@ -81,6 +78,6 @@
   "m_i18nNameId": 60939,
   "m_i18nDescriptionId": 64971,
   "m_elementaryStates": 1,
-  "assetGuid": "4a2038f53e564a94896e371535cbdd5c",
+  "assetGuid": "",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/55183.json b/data/json/SpellDefinition/55183.json
index 219bf249c301bc33a3b4629153bd09560b1fa357..643fd0c14c8224e39648ec224393ae09a07c0f9f 100644
--- a/data/json/SpellDefinition/55183.json
+++ b/data/json/SpellDefinition/55183.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55183,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,13 +55,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 2.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 15
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/SpellDefinition/552.json b/data/json/SpellDefinition/552.json
index 3720d7f4b1b051ea4da056789cbb97137a194084..d82f4ec95876a78d4ad2cf8322b4a97acbf2435e 100644
--- a/data/json/SpellDefinition/552.json
+++ b/data/json/SpellDefinition/552.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 552,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/553.json b/data/json/SpellDefinition/553.json
index ef519ef72179859af817a5adbc3c5f2dacfad4cd..d8a2edb330784aeb60c2f512969105c1a198feff 100644
--- a/data/json/SpellDefinition/553.json
+++ b/data/json/SpellDefinition/553.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 553,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/55383.json b/data/json/SpellDefinition/55383.json
index 7bdb035063b87dd5bec7e7d4978a73bf282152c4..c097a5fe3bfbd2bb09e9fb31d7804a23baf8d42c 100644
--- a/data/json/SpellDefinition/55383.json
+++ b/data/json/SpellDefinition/55383.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55383,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,13 +53,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 10.4,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 50
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/55394.json b/data/json/SpellDefinition/55394.json
index b7f602b5d835e811bc4139728895bad3e094b1ce..367ef067138193da5ed41a3693815a31a66c4354 100644
--- a/data/json/SpellDefinition/55394.json
+++ b/data/json/SpellDefinition/55394.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55394,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/554.json b/data/json/SpellDefinition/554.json
index 915ba69609bc219b6ffe9e0fa0eb92a00a6650ef..e5092307b7399f8bac89f449095a4e4d84d20a96 100644
--- a/data/json/SpellDefinition/554.json
+++ b/data/json/SpellDefinition/554.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 554,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/55429.json b/data/json/SpellDefinition/55429.json
index 1063792007ab0ae84cf735b6c34a3b63ee4625e5..95cc0bd33df4c155c0fc286c062cc634bfecf186 100644
--- a/data/json/SpellDefinition/55429.json
+++ b/data/json/SpellDefinition/55429.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55429,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -38,31 +39,33 @@
       2
     ],
     "eventsInvalidatingTooltip": [
-      2,
-      8,
-      9,
-      11
+      2
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 23.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 29.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 100
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/555.json b/data/json/SpellDefinition/555.json
index 48ea442a45c1157796cf33daa43db710d7ad1654..b0dbb1af97fc6ccb29117f80be380169d18cef93 100644
--- a/data/json/SpellDefinition/555.json
+++ b/data/json/SpellDefinition/555.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 555,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/556.json b/data/json/SpellDefinition/556.json
index b54c93ed5bdce614719e5bad9c6104077ab73470..208d877004e4a9a0c86d520cc39db53e5a909c35 100644
--- a/data/json/SpellDefinition/556.json
+++ b/data/json/SpellDefinition/556.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 556,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/5578.json b/data/json/SpellDefinition/5578.json
index f124f22701e67f8548330137b3716920cb894105..de28f16c6019cba275c2189b5de18638eb77742b 100644
--- a/data/json/SpellDefinition/5578.json
+++ b/data/json/SpellDefinition/5578.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 5578,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/55797.json b/data/json/SpellDefinition/55797.json
index 1e1cfed00afaeb3d34190d9b11a08f6330813680..be9df8dfd67f393a1cf30c275589f65317e57ba1 100644
--- a/data/json/SpellDefinition/55797.json
+++ b/data/json/SpellDefinition/55797.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55797,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/558.json b/data/json/SpellDefinition/558.json
index dd8970c03c4786a9d1f34c2ae4deb8aed526e91c..043b5dbdfcfc8c3315c2e8c4d762e294fb7113e1 100644
--- a/data/json/SpellDefinition/558.json
+++ b/data/json/SpellDefinition/558.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 558,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/55846.json b/data/json/SpellDefinition/55846.json
index 37772eae04efad179db3b295db6b4a4ae8fa8e72..4284b8a671dcea461f6d7229f7581732b90aede1 100644
--- a/data/json/SpellDefinition/55846.json
+++ b/data/json/SpellDefinition/55846.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55846,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/559.json b/data/json/SpellDefinition/559.json
index 2d1d85053d7fe5620a12600b347fec2afe732627..650d487151d9be92f4d9093c0e1f92b92f672438 100644
--- a/data/json/SpellDefinition/559.json
+++ b/data/json/SpellDefinition/559.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 559,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/55929.json b/data/json/SpellDefinition/55929.json
index 0f996565e396be41b0ea9f658de153f09bb38dda..c49055556dd1da1c9d88efeeb2178c33c293d7ce 100644
--- a/data/json/SpellDefinition/55929.json
+++ b/data/json/SpellDefinition/55929.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 55929,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/56.json b/data/json/SpellDefinition/56.json
index 393822cd8d1bde47c1280cbdd5177489f578b3ed..2eff0a2b29cd224b60f8b557a4fc8a5c9427ece3 100644
--- a/data/json/SpellDefinition/56.json
+++ b/data/json/SpellDefinition/56.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 56,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/562.json b/data/json/SpellDefinition/562.json
index e3090a034fcadbe04359288e54fd6fa283143e65..4055d38a5a82ebe3bce333aff6e2260be2839437 100644
--- a/data/json/SpellDefinition/562.json
+++ b/data/json/SpellDefinition/562.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 562,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -89,21 +90,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
-          "baseValue": 31.3,
+          "baseValue": 30.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
-          "baseValue": 38.3,
+          "baseValue": 37.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -113,7 +114,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE CHAFER - Souffle Osseux",
diff --git a/data/json/SpellDefinition/563.json b/data/json/SpellDefinition/563.json
index 32160a832101f16e02bcd207d4d3c1aaa7969049..8524f444b31bb4608f48aac6b859e8ee7542001c 100644
--- a/data/json/SpellDefinition/563.json
+++ b/data/json/SpellDefinition/563.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 563,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/564.json b/data/json/SpellDefinition/564.json
index d811f441321c9a02f18e9692c30c1854d14860b1..adb379a681c7f1759366f92660225cb7baf6704c 100644
--- a/data/json/SpellDefinition/564.json
+++ b/data/json/SpellDefinition/564.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 564,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/56491.json b/data/json/SpellDefinition/56491.json
index 8e6229a74d9b6638b97bc70a5240d11fb489f0e8..722f36a2eebe1c931813392e9e0f6f966019e34f 100644
--- a/data/json/SpellDefinition/56491.json
+++ b/data/json/SpellDefinition/56491.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 56491,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/565.json b/data/json/SpellDefinition/565.json
index bc8dfd9c4c051d81b533d0c14e3e7d8375d93ed7..51cffb94178ba7e9e0cc49c3529ccf9bd63a8f9e 100644
--- a/data/json/SpellDefinition/565.json
+++ b/data/json/SpellDefinition/565.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 565,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/566.json b/data/json/SpellDefinition/566.json
index ee7f366b6434f1a7b6bb890e7a63c269439db495..98ad0f8b222de97b298681e0df94ae55e7e0ef01 100644
--- a/data/json/SpellDefinition/566.json
+++ b/data/json/SpellDefinition/566.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 566,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -77,7 +78,6 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
         "AVENGERHOURGLASS"
       ]
     }
diff --git a/data/json/SpellDefinition/56692.json b/data/json/SpellDefinition/56692.json
index 8de5a4a321023318e477a370042eadbc6d733691..44bccce2e38ed5a4d6cc6d6cc9d0e3dbbce87aca 100644
--- a/data/json/SpellDefinition/56692.json
+++ b/data/json/SpellDefinition/56692.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 56692,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/567.json b/data/json/SpellDefinition/567.json
index 930ebaf5227e9f90aa6c2a379d2436a0028489ae..fca92accd570b5dd254eb927ab0eaf169ac42dab 100644
--- a/data/json/SpellDefinition/567.json
+++ b/data/json/SpellDefinition/567.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 567,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/568.json b/data/json/SpellDefinition/568.json
index b0e7c49a84062c0430bfcf488b9fd36cedccf39d..cb97ff78a4d3f912d8bb7e2d6f39cf0a2efb9a4d 100644
--- a/data/json/SpellDefinition/568.json
+++ b/data/json/SpellDefinition/568.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 568,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/569.json b/data/json/SpellDefinition/569.json
index ab4667f805af096581bb1ffc446324302721b265..49d0367a14d45406ce29e9f0f68c8a951103f0bf 100644
--- a/data/json/SpellDefinition/569.json
+++ b/data/json/SpellDefinition/569.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 569,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 24.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 29.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/57.json b/data/json/SpellDefinition/57.json
index 33a47325f06d05b2731449a1039d3240fa0c8ce5..e564d465adfea473a4332d228bb44d8ed7cf202e 100644
--- a/data/json/SpellDefinition/57.json
+++ b/data/json/SpellDefinition/57.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 57,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/571.json b/data/json/SpellDefinition/571.json
index ffe3b867eca9821c3dd7d89e82a6b877b71efffb..bd14e832db83f139b9bfd0788718b524b602e361 100644
--- a/data/json/SpellDefinition/571.json
+++ b/data/json/SpellDefinition/571.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 571,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/57387.json b/data/json/SpellDefinition/57387.json
index 651bf88219a267bcd81298ba0dc3a737dd321c98..dc8653cd849adafd32c06144ca15077533cd688c 100644
--- a/data/json/SpellDefinition/57387.json
+++ b/data/json/SpellDefinition/57387.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 57387,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -57,21 +58,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 21.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/574.json b/data/json/SpellDefinition/574.json
index d23fc0ef9924c89146c95f38a73ae96d1ef21420..ce779bd35921e63804a696936cf7d10cfe9d3464 100644
--- a/data/json/SpellDefinition/574.json
+++ b/data/json/SpellDefinition/574.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 574,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/57409.json b/data/json/SpellDefinition/57409.json
index 81c5c219ee0484321e1e6c80812ba74f11558716..32218e60bb607ac0b2823dc6c967a5641eb6d919 100644
--- a/data/json/SpellDefinition/57409.json
+++ b/data/json/SpellDefinition/57409.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 57409,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -44,21 +45,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 2.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 3.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/575.json b/data/json/SpellDefinition/575.json
index 5b839a09b4fcb696b2a60ebae143f98a35b40923..8818f3e7fef14016ced4163573b97e12088faf88 100644
--- a/data/json/SpellDefinition/575.json
+++ b/data/json/SpellDefinition/575.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 575,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/57592.json b/data/json/SpellDefinition/57592.json
index e923e759bfa3cd6fc60c26405cb04893fea91878..b68844a9743ba920937d4f9e2cb6a38ffba1eb1c 100644
--- a/data/json/SpellDefinition/57592.json
+++ b/data/json/SpellDefinition/57592.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 57592,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -48,21 +49,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 21.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/57732.json b/data/json/SpellDefinition/57732.json
index 49a43a7d802ed1ba4ba158621c7044b05233c0c2..c4c7edb3405adf1224217188201c30bfedcd1b10 100644
--- a/data/json/SpellDefinition/57732.json
+++ b/data/json/SpellDefinition/57732.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 57732,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 9.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/578.json b/data/json/SpellDefinition/578.json
index f0e949ca703b61c364dc708a254ca5db2fecda12..00c6362bf4cae203848aab6c549d48a3aa5c746f 100644
--- a/data/json/SpellDefinition/578.json
+++ b/data/json/SpellDefinition/578.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 578,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/579.json b/data/json/SpellDefinition/579.json
index 22ccbf12370f606433a2b55689ba4760c51e3553..f3c313988ff46982a16aee1c479ff988be752964 100644
--- a/data/json/SpellDefinition/579.json
+++ b/data/json/SpellDefinition/579.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 579,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/58.json b/data/json/SpellDefinition/58.json
index 3c4d9a92396c9dfcbf59b187af9ec5d020de08bf..04c2d9959ebd1f6e9f042444429a5781522d586f 100644
--- a/data/json/SpellDefinition/58.json
+++ b/data/json/SpellDefinition/58.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 58,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,21 +57,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/582.json b/data/json/SpellDefinition/582.json
index 4c226c284ca64554b998996c8a2175686e5e16b4..e74d76361a0286887c6f16e4dc35a59a1ebfc449 100644
--- a/data/json/SpellDefinition/582.json
+++ b/data/json/SpellDefinition/582.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 582,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 21.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/584.json b/data/json/SpellDefinition/584.json
index 5f410da534c5159c72f5334e43a915fef971a95d..f6db5eb112d574c565b3a097d4d85350998de0d5 100644
--- a/data/json/SpellDefinition/584.json
+++ b/data/json/SpellDefinition/584.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 584,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        8
+        8,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/58468.json b/data/json/SpellDefinition/58468.json
index 6dccf4228efa6f8686e9673af4b2942074d734c6..85b1958526156c83fcec2987ae95d1d611c026d6 100644
--- a/data/json/SpellDefinition/58468.json
+++ b/data/json/SpellDefinition/58468.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 58468,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -47,21 +48,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 17.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/587.json b/data/json/SpellDefinition/587.json
index 012a81d7adfb7cee6649ebe8a7a676b8ca528973..2326c4d0cda434579bcd13c556d3c015a2adf405 100644
--- a/data/json/SpellDefinition/587.json
+++ b/data/json/SpellDefinition/587.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 587,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -75,21 +76,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 6.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 8.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/58711.json b/data/json/SpellDefinition/58711.json
index f0aaae3c31ee01d960325706e8e9f08b219ad6a0..8c7377f09f61ff8e18246f6ef46f069652177a44 100644
--- a/data/json/SpellDefinition/58711.json
+++ b/data/json/SpellDefinition/58711.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 58711,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,9 +57,6 @@
                 "value": 1
               }
             }
-          },
-          {
-            "type": "CellValidForCharacterFilter"
           }
         ]
       }
@@ -95,7 +93,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "IOP - Page 2 du Grimoire des Vents",
diff --git a/data/json/SpellDefinition/589.json b/data/json/SpellDefinition/589.json
index e7c21b6e09a761546630fa30eb0c6a990c591ceb..02d5ca98fb87594bb8ab30f8e7139a7faecaeb88 100644
--- a/data/json/SpellDefinition/589.json
+++ b/data/json/SpellDefinition/589.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 589,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,12 +55,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 16.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/59.json b/data/json/SpellDefinition/59.json
index e37aed537d249d5b52eb5ac1ab9faf832d9c56c1..fc8527a3cf93e66b97ca4db2e93bccaddf8a7954 100644
--- a/data/json/SpellDefinition/59.json
+++ b/data/json/SpellDefinition/59.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 59,
+    "merchantCosts": [],
     "tags": [
       3
     ],
@@ -12,7 +13,8 @@
       "element": 4,
       "equipable": true,
       "families": [
-        2
+        2,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/590.json b/data/json/SpellDefinition/590.json
index 122c3bcc5f846d1f61bad078cc317d87ef773bd0..97b5f2e54d0d60a6caa626b4d5e40f3be8505e34 100644
--- a/data/json/SpellDefinition/590.json
+++ b/data/json/SpellDefinition/590.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 590,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -36,7 +43,15 @@
       "type": "OneCastTargetDefinition",
       "selector": {
         "type": "FilteredCharacterSelector",
-        "filters": []
+        "filters": [
+          {
+            "type": "TeamFilter",
+            "isIdentical": true,
+            "reference": {
+              "type": "CasterSelector"
+            }
+          }
+        ]
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/59032.json b/data/json/SpellDefinition/59032.json
index b66e8b9d8ae181047af52fb9de901c4324671cd9..76b92c6f4c565fece1e79df2f378eeb97bfe0257 100644
--- a/data/json/SpellDefinition/59032.json
+++ b/data/json/SpellDefinition/59032.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 59032,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/59039.json b/data/json/SpellDefinition/59039.json
index 14ec5fb0a3ef20fbdbf546734281107e54846e00..350a878bad3d0fb36245d74906503bfe074bb030 100644
--- a/data/json/SpellDefinition/59039.json
+++ b/data/json/SpellDefinition/59039.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 59039,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/59060.json b/data/json/SpellDefinition/59060.json
index ba97ce230bf33e1dfc430c03cb29edae1db34d0a..b7541dbdefe6be8fb1f4673f548a14ee16591a9b 100644
--- a/data/json/SpellDefinition/59060.json
+++ b/data/json/SpellDefinition/59060.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 59060,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/591.json b/data/json/SpellDefinition/591.json
index daf02585b3d47e3b06d68438ede1e43900acff14..8e801566a09934c2d19a74c32230dbdf5f64ee64 100644
--- a/data/json/SpellDefinition/591.json
+++ b/data/json/SpellDefinition/591.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 591,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/5912.json b/data/json/SpellDefinition/5912.json
index 84d4a4772fe8628571026b4571ed0f15b41f01d2..785bfda9af8cd00db5669a4189f9405f54ddd6e7 100644
--- a/data/json/SpellDefinition/5912.json
+++ b/data/json/SpellDefinition/5912.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 5912,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/592.json b/data/json/SpellDefinition/592.json
index e757ef93040f0a506867fa7dd16215cf33c820ce..6075901365ba5442d76bbf47e80c8eb3579ba2a2 100644
--- a/data/json/SpellDefinition/592.json
+++ b/data/json/SpellDefinition/592.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 592,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/593.json b/data/json/SpellDefinition/593.json
index 3411bb8b06c56446e7168ac47ee1dc2aedb90c70..2c74def727b39cc838b6b13b253a4c843f590109 100644
--- a/data/json/SpellDefinition/593.json
+++ b/data/json/SpellDefinition/593.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 593,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/594.json b/data/json/SpellDefinition/594.json
index 6785f8a4fba09bf462469fff61b8c22fa6b641de..87931384dc35ee4ed55080b1dc0ae6d76d188ffa 100644
--- a/data/json/SpellDefinition/594.json
+++ b/data/json/SpellDefinition/594.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 594,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/59489.json b/data/json/SpellDefinition/59489.json
index f926993016a8546701ccf09db36af270d5f24d6c..4117a1b331e54ccb5d12504795eb81626e068d8e 100644
--- a/data/json/SpellDefinition/59489.json
+++ b/data/json/SpellDefinition/59489.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 59489,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/596.json b/data/json/SpellDefinition/596.json
index e730d181092beda2cffa576b82f0ae76a507a05c..b9ce716b432f9a1ebb71cb1205eeff909a988a6a 100644
--- a/data/json/SpellDefinition/596.json
+++ b/data/json/SpellDefinition/596.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 596,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -97,21 +98,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 8.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/59623.json b/data/json/SpellDefinition/59623.json
index b652a36a31fa7c2aef9d47457d6d65e1c9ff5eb0..fae081271a55cc834e9bb5a6139b2090d59c4683 100644
--- a/data/json/SpellDefinition/59623.json
+++ b/data/json/SpellDefinition/59623.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 59623,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/597.json b/data/json/SpellDefinition/597.json
index 00c00f297c5a61e07330cec01c5541cba71b8b7a..33dddcc632cd4ce0989c673a03935296710db2b3 100644
--- a/data/json/SpellDefinition/597.json
+++ b/data/json/SpellDefinition/597.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 597,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
       "equipable": true,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/598.json b/data/json/SpellDefinition/598.json
index b33f56407766e10cc60c47a1fee27abe3ea63da4..834bd6a3249986b4bddbc0f363639326d078345c 100644
--- a/data/json/SpellDefinition/598.json
+++ b/data/json/SpellDefinition/598.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 598,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,21 +53,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 15.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/599.json b/data/json/SpellDefinition/599.json
index f929a09a9b3355ae6a4394a30f2c2c7d9e17e210..2d55fe4acbe6e2a5ebece8cc966204358ac25313 100644
--- a/data/json/SpellDefinition/599.json
+++ b/data/json/SpellDefinition/599.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 599,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/60.json b/data/json/SpellDefinition/60.json
index 2965c177e0b1713b6b4ff9c1e716490b4e90faa5..93879e48bf66b5f87b5d50afe18ddc3f4103cf05 100644
--- a/data/json/SpellDefinition/60.json
+++ b/data/json/SpellDefinition/60.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 60,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -70,21 +71,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 23.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/600.json b/data/json/SpellDefinition/600.json
index 34c45b2434f2d07fdbd82baca924bb0e900039f5..7a25a549121e1dbf58f59a4cc560de0b82584500 100644
--- a/data/json/SpellDefinition/600.json
+++ b/data/json/SpellDefinition/600.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 600,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/601.json b/data/json/SpellDefinition/601.json
index fc9c62180d07fd80a18d6d5dce26904789d111b5..3a28bb64ddb140a339ae75959db3d68913ab76ef 100644
--- a/data/json/SpellDefinition/601.json
+++ b/data/json/SpellDefinition/601.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 601,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/602.json b/data/json/SpellDefinition/602.json
index 5520bcabcad518bb92f392d9b38f607b8cf50027..5639b766f84a3ede80385d63f5eb08ca24af516c 100644
--- a/data/json/SpellDefinition/602.json
+++ b/data/json/SpellDefinition/602.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 602,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 7.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 8.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/60215.json b/data/json/SpellDefinition/60215.json
index 9fd2219e0a69a150a4bb44b2e12a6dcae6cdc3ca..fe482b62a09c1bfc9977ce26d2a764e068bf63b9 100644
--- a/data/json/SpellDefinition/60215.json
+++ b/data/json/SpellDefinition/60215.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 60215,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/60232.json b/data/json/SpellDefinition/60232.json
index bd1a5818cab67469d68b9abcda1d4a533e78e3cd..3615d8837ca917da2d9a09417e4646779f442c9e 100644
--- a/data/json/SpellDefinition/60232.json
+++ b/data/json/SpellDefinition/60232.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 60232,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/60406.json b/data/json/SpellDefinition/60406.json
index 293126ee8f2ae15c7171b1d0ccc134e137e5574a..cead36182459fdf923858801040ad80941098cc7 100644
--- a/data/json/SpellDefinition/60406.json
+++ b/data/json/SpellDefinition/60406.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 60406,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/60508.json b/data/json/SpellDefinition/60508.json
index d5c67caafd5aa7b15d081f957c37d1ed04fa33e4..3fd2e3f99dbe120abe5e88d423a5cd35d026c4f6 100644
--- a/data/json/SpellDefinition/60508.json
+++ b/data/json/SpellDefinition/60508.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 60508,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/61.json b/data/json/SpellDefinition/61.json
index 1bc4bf4177459aeede04666755730978628c3cb1..6a480a009d40996eae348370eca5c2c59f862941 100644
--- a/data/json/SpellDefinition/61.json
+++ b/data/json/SpellDefinition/61.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/610.json b/data/json/SpellDefinition/610.json
index f6b8a55fd46fb02fa116bfb902b2d7eaaaf3d9e2..df04616f421c4f6693fa9f025fe57ef1de1c0f95 100644
--- a/data/json/SpellDefinition/610.json
+++ b/data/json/SpellDefinition/610.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 610,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 6.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/61009.json b/data/json/SpellDefinition/61009.json
index 2f902e4e15b71e2169e2266c66819343fe141a5d..34b8f7fb06cc1b5fb1d6e0ed42033992f92cb950 100644
--- a/data/json/SpellDefinition/61009.json
+++ b/data/json/SpellDefinition/61009.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61009,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/61029.json b/data/json/SpellDefinition/61029.json
index 12ad03657999c3b82d4fab5d2e112d982221eb98..a546c8a6901405a8ee43378210977d6e6b83baff 100644
--- a/data/json/SpellDefinition/61029.json
+++ b/data/json/SpellDefinition/61029.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61029,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/61045.json b/data/json/SpellDefinition/61045.json
index 5d66e391aa293e262153ec4f09b9ecff405d19ac..971537137c36ceda957358c1074e6960361668c5 100644
--- a/data/json/SpellDefinition/61045.json
+++ b/data/json/SpellDefinition/61045.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61045,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/611.json b/data/json/SpellDefinition/611.json
index 4755f1766fb98d3a117be3e4578b3ca857c133dd..a00ddfaf70dce7e22d1f9af95c2604516b46e3e9 100644
--- a/data/json/SpellDefinition/611.json
+++ b/data/json/SpellDefinition/611.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 611,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/61201.json b/data/json/SpellDefinition/61201.json
index 6affa52e9f56ff6c5c9e83ce6950cc852154cf5b..b1fe526114986b4e949723e817da4777e3ad168c 100644
--- a/data/json/SpellDefinition/61201.json
+++ b/data/json/SpellDefinition/61201.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61201,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/613.json b/data/json/SpellDefinition/613.json
index 57744e65c229ddc0e0a081faeec85a231d4c87d2..73cd578f0f9c34b648559a058c6211662bcd2008 100644
--- a/data/json/SpellDefinition/613.json
+++ b/data/json/SpellDefinition/613.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 613,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/614.json b/data/json/SpellDefinition/614.json
index d45521801848b2dd070d22c38448309894085a7e..d3494425540fb40dfb920dd8a4fad6cfe4ada91c 100644
--- a/data/json/SpellDefinition/614.json
+++ b/data/json/SpellDefinition/614.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 614,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -69,21 +70,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 20.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 27.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/615.json b/data/json/SpellDefinition/615.json
index 87b0360768342f57b80160d18766d5520c742c4b..a5283b8db5f156e6cab119ce02972a4e1549e27d 100644
--- a/data/json/SpellDefinition/615.json
+++ b/data/json/SpellDefinition/615.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 615,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/61533.json b/data/json/SpellDefinition/61533.json
index 7163af17b313440fbc4738fbef7e5002c84095b3..e9559ea1238f4561a8ef96ced13b22d788dfcb2d 100644
--- a/data/json/SpellDefinition/61533.json
+++ b/data/json/SpellDefinition/61533.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61533,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/616.json b/data/json/SpellDefinition/616.json
index 80068928adb5e6695c41c5034eebbe2bfcd1cfe9..67aff4ecc0d0945497fa0ef1590c0df6515052b7 100644
--- a/data/json/SpellDefinition/616.json
+++ b/data/json/SpellDefinition/616.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 616,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -31,48 +32,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -106,7 +82,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 20
+          "value": 19
         },
         {
           "type": "ConstIntegerValue",
@@ -115,7 +91,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "SRAM - Sanglade",
diff --git a/data/json/SpellDefinition/61647.json b/data/json/SpellDefinition/61647.json
index 9092c99cd173ce65ad08b42cc287cd86b846a40c..e6a8221d9561140a894dba601de34569ba5eff4f 100644
--- a/data/json/SpellDefinition/61647.json
+++ b/data/json/SpellDefinition/61647.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 61647,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/617.json b/data/json/SpellDefinition/617.json
index c1f18aec556ed7c08afe80b98d1e2db6f4dfb167..209779da6dc9772c6c7e0a3fc27cc7d5a4d76a59 100644
--- a/data/json/SpellDefinition/617.json
+++ b/data/json/SpellDefinition/617.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 617,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/618.json b/data/json/SpellDefinition/618.json
index a69ddea7ff590626fece3856f7b6f184a94e71c3..51e330844493ba3720b6a54faa96c014cfd7ad04 100644
--- a/data/json/SpellDefinition/618.json
+++ b/data/json/SpellDefinition/618.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 618,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/619.json b/data/json/SpellDefinition/619.json
index b8980ea1781c2a449241f024514bb1bbdbdc9ad9..a7674e2d856dd1c4e134a6208c5e1dfa3ce9cc8a 100644
--- a/data/json/SpellDefinition/619.json
+++ b/data/json/SpellDefinition/619.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 619,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/62.json b/data/json/SpellDefinition/62.json
index 896efcf1e30a71cdd781cfd0cc7d7ae9d2786fa3..d285c78627d33c47fb52d2ad0b5b60b31e858ad9 100644
--- a/data/json/SpellDefinition/62.json
+++ b/data/json/SpellDefinition/62.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 62,
+    "merchantCosts": [],
     "tags": [
       1
     ],
diff --git a/data/json/SpellDefinition/621.json b/data/json/SpellDefinition/621.json
index bd24db9c7f4b43b4dc32f131c9ba9d4b7fcfd899..4d050ebf8958b3b09882365426ab21a378f4a514 100644
--- a/data/json/SpellDefinition/621.json
+++ b/data/json/SpellDefinition/621.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 621,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/622.json b/data/json/SpellDefinition/622.json
index ac6144d729c722f4e0c8e6b0af1f5991d629cbb0..b760f942b98609376eedaaf8a6385564b8837628 100644
--- a/data/json/SpellDefinition/622.json
+++ b/data/json/SpellDefinition/622.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 622,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/62257.json b/data/json/SpellDefinition/62257.json
index 1fafe6c1737b4b96b4cb02b36e05ec4d1794460f..7e8272126b187cdd7d48d93193c6a12413ee9f2b 100644
--- a/data/json/SpellDefinition/62257.json
+++ b/data/json/SpellDefinition/62257.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 62257,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/623.json b/data/json/SpellDefinition/623.json
index dd986d7554f0267c6ca2719d26d8d57c8aef8c28..a6fcde859abf64c7fdee164438fd2973ca29e683 100644
--- a/data/json/SpellDefinition/623.json
+++ b/data/json/SpellDefinition/623.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 623,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         7
       ]
@@ -40,7 +41,15 @@
         "type": "CasterHeroSelector"
       }
     },
-    "spellEffectData": [],
+    "spellEffectData": [
+      {
+        "type": "SpellEffectInstantiationData",
+        "spellEffect": "9e87069a9b0e8e14b810a68b21a64622",
+        "originTarget": {
+          "type": "FirstCastTargetSelector"
+        }
+      }
+    ],
     "eventsInvalidatingCost": [
       2
     ],
@@ -71,7 +80,6 @@
   "m_i18nNameId": 47300,
   "m_i18nDescriptionId": 36944,
   "m_elementaryStates": 1,
-  "assetGuid": "ad6e8d226786e064aac545009e07fa7d",
-  "size": 2,
-  "data": 2051
+  "assetGuid": "d511a98bb30d73641a68da5233ec8a90",
+  "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/624.json b/data/json/SpellDefinition/624.json
index cc1e18622d05f638744f1e640b69815a156d326f..4d400c5e63ba2e143b129373385f8a1de0c62c18 100644
--- a/data/json/SpellDefinition/624.json
+++ b/data/json/SpellDefinition/624.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 624,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -101,39 +102,31 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 20
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 8.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "boost1",
-          "baseValue": 2.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 10
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "boost2",
           "baseValue": 5.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/625.json b/data/json/SpellDefinition/625.json
index 79fa704c7c668102dd66f924ad1e390378e27a75..53621a4289b94d9090bd7a23c0c6ba960318f2fb 100644
--- a/data/json/SpellDefinition/625.json
+++ b/data/json/SpellDefinition/625.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 625,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/627.json b/data/json/SpellDefinition/627.json
index 1a734ebfefc8e61b34e9a418604756973274e4c2..e25bb02c9a975b8bfa1f29a6adac7d7fc2a553e7 100644
--- a/data/json/SpellDefinition/627.json
+++ b/data/json/SpellDefinition/627.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 627,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/628.json b/data/json/SpellDefinition/628.json
index 265dc3efe94c6f7535ee97267c7994c858b0d2ff..25688aaa9e9a5e5339845f66c64a97d9d57593c6 100644
--- a/data/json/SpellDefinition/628.json
+++ b/data/json/SpellDefinition/628.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 628,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/62935.json b/data/json/SpellDefinition/62935.json
index b99a002de9b3dc82926d628a17d46dd0f274deb8..377ba13c836ce72ad7df5f6dc5e4d0a3d08a6180 100644
--- a/data/json/SpellDefinition/62935.json
+++ b/data/json/SpellDefinition/62935.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 62935,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/63.json b/data/json/SpellDefinition/63.json
index 23b9ca1113f023e5b8c3c89da6d6f5dd69e20cc5..039c319f45846ada76d6723167efbd913e741e13 100644
--- a/data/json/SpellDefinition/63.json
+++ b/data/json/SpellDefinition/63.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 63,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/631.json b/data/json/SpellDefinition/631.json
index 19c81928087fe2076478840c9f019c5cb62caab1..d3bb808c8ae44bddf6df9e16bb15bc6fe2b4e344 100644
--- a/data/json/SpellDefinition/631.json
+++ b/data/json/SpellDefinition/631.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 631,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/63100.json b/data/json/SpellDefinition/63100.json
index 8617ab7f131572b6d2c7876940e661a6a5f83a5a..ceee519be9281cc848d96c1e50a366c08335ac3f 100644
--- a/data/json/SpellDefinition/63100.json
+++ b/data/json/SpellDefinition/63100.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 63100,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/6313.json b/data/json/SpellDefinition/6313.json
index 48b15deab9c332f35d63fb2cd1cc775471b37fdb..c884bc9c355c235fb4b407224681834e17acd754 100644
--- a/data/json/SpellDefinition/6313.json
+++ b/data/json/SpellDefinition/6313.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 6313,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/632.json b/data/json/SpellDefinition/632.json
index 3c2fa949eb99a2dd278dce2268e925c6080c2acc..7cd0ba0304cb4a61ac7e4d5a73305a01106f382f 100644
--- a/data/json/SpellDefinition/632.json
+++ b/data/json/SpellDefinition/632.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 632,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/633.json b/data/json/SpellDefinition/633.json
index 1dd7fb5bb57756405d688902ca679726b0058f63..61cd0e6ead3786d2d70cd74a442723206de88452 100644
--- a/data/json/SpellDefinition/633.json
+++ b/data/json/SpellDefinition/633.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 633,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/634.json b/data/json/SpellDefinition/634.json
index 9fede040ae903d82c6f169193aaaeeaa9426d37f..88e35b2b178a7c93822c579f212d4b0dcf082621 100644
--- a/data/json/SpellDefinition/634.json
+++ b/data/json/SpellDefinition/634.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 634,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": true,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/63479.json b/data/json/SpellDefinition/63479.json
index df2a7b6a407a9a401395e11bedbd0c97e4ec8bf8..6700dc4069570ffa7a455b7665ab22565aa245fc 100644
--- a/data/json/SpellDefinition/63479.json
+++ b/data/json/SpellDefinition/63479.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 63479,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/635.json b/data/json/SpellDefinition/635.json
index de38e16877fa33bc2356aeb317e8bc574f834703..807ac55578b1fd61ecf2f94e5ff7c05802d09573 100644
--- a/data/json/SpellDefinition/635.json
+++ b/data/json/SpellDefinition/635.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 635,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/636.json b/data/json/SpellDefinition/636.json
index 2181c639dcfee8f9e9977632ae76ca3b96bee5e4..133e9ce2e8ed2c5de3b3e8c124ca2d78a74c4fe8 100644
--- a/data/json/SpellDefinition/636.json
+++ b/data/json/SpellDefinition/636.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 636,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/637.json b/data/json/SpellDefinition/637.json
index 40082d0adaa47aecdc237d213da0768bd96f4266..304ca3530d664938bc2cddc29fc4956c33f32481 100644
--- a/data/json/SpellDefinition/637.json
+++ b/data/json/SpellDefinition/637.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 637,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/63717.json b/data/json/SpellDefinition/63717.json
index 38726e9365880ececdf2fe0916ab5266c11e060f..cf0304613ea9493662a9b2ae5d1c9ee424b4b8ba 100644
--- a/data/json/SpellDefinition/63717.json
+++ b/data/json/SpellDefinition/63717.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 63717,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/638.json b/data/json/SpellDefinition/638.json
index 0206bd60ed80b38217dfd011ddcb06aecf5acf34..d2f32f23309bdbf45431d37d2c36b644eb5bd8fb 100644
--- a/data/json/SpellDefinition/638.json
+++ b/data/json/SpellDefinition/638.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 638,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/639.json b/data/json/SpellDefinition/639.json
index 69e9724bd0094b63fef1281918f55ed3b9c2f0e8..2b159cb410dd27643754f4716901d225ec3e60e8 100644
--- a/data/json/SpellDefinition/639.json
+++ b/data/json/SpellDefinition/639.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 639,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        6
+        6,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/64.json b/data/json/SpellDefinition/64.json
index bcdb9f16695774b84e1b7869f52dcd5037dafd6e..4e57bacedf643c5a70f0ba283d4efc33e4ce67bc 100644
--- a/data/json/SpellDefinition/64.json
+++ b/data/json/SpellDefinition/64.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 64,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/640.json b/data/json/SpellDefinition/640.json
index f7c38b731ebbf1b88e820d9df95e200460577105..fb4b52c05543a1261efece94133942a28ab4cd2e 100644
--- a/data/json/SpellDefinition/640.json
+++ b/data/json/SpellDefinition/640.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 640,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        11
+        11,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/642.json b/data/json/SpellDefinition/642.json
index a97027549186888da5f22be1c56766737bd440c1..3c2064d0fbf6021c3e6edca664fb5540bd652327 100644
--- a/data/json/SpellDefinition/642.json
+++ b/data/json/SpellDefinition/642.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 642,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/643.json b/data/json/SpellDefinition/643.json
index 96c137a795ea80e18f694bf4dd4528ae00e40132..4af260723d14f3b3fc4c45b1ebb68f6aef33b3dd 100644
--- a/data/json/SpellDefinition/643.json
+++ b/data/json/SpellDefinition/643.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 643,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/64308.json b/data/json/SpellDefinition/64308.json
index ea4c0366acdc65ca564dd74cb95b26a275c89ca8..6c8482fba4a117a58550a455adb45e7dcdda9d49 100644
--- a/data/json/SpellDefinition/64308.json
+++ b/data/json/SpellDefinition/64308.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 64308,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/644.json b/data/json/SpellDefinition/644.json
index c22a0b7a0748518d8bfef61cf8506f7add01273a..3904baa02851de977893aca5e654957b023201a7 100644
--- a/data/json/SpellDefinition/644.json
+++ b/data/json/SpellDefinition/644.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 644,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/645.json b/data/json/SpellDefinition/645.json
index e6c88874dab8c25725d6b96ffbe54cb665505433..770fde491b0fb7b2a5683b182eb4a66068cd8122 100644
--- a/data/json/SpellDefinition/645.json
+++ b/data/json/SpellDefinition/645.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 645,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/64522.json b/data/json/SpellDefinition/64522.json
index cfd485bde344cea3b7bbafc464dc4d405b99f4d4..678b487a111bb4077606d615024cf3e7072fb45a 100644
--- a/data/json/SpellDefinition/64522.json
+++ b/data/json/SpellDefinition/64522.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 64522,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/646.json b/data/json/SpellDefinition/646.json
index e362a9d6df72c8cf02e9e6d6384fe180d5bd5f02..8c71017a8e4ee6ed35a68e272a4340df86d9763a 100644
--- a/data/json/SpellDefinition/646.json
+++ b/data/json/SpellDefinition/646.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 646,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/647.json b/data/json/SpellDefinition/647.json
index 6abbc6bb54f5962e4dc813744a35a76868fcca12..4df2c91a35f2f49ce72a5d5a6920761c29391cbe 100644
--- a/data/json/SpellDefinition/647.json
+++ b/data/json/SpellDefinition/647.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 647,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/64779.json b/data/json/SpellDefinition/64779.json
index b00d3c9a94487127c3984880c743a5ba44e48039..39babcc75b473b9ed4cd5d49d76347acf8cf5953 100644
--- a/data/json/SpellDefinition/64779.json
+++ b/data/json/SpellDefinition/64779.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 64779,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/648.json b/data/json/SpellDefinition/648.json
index 8f1d5d70754cc17b1e259658566e28921c8bbf74..b5e27d7966f8d1564d1bad4fd8899ad07ad8a976 100644
--- a/data/json/SpellDefinition/648.json
+++ b/data/json/SpellDefinition/648.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 648,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/649.json b/data/json/SpellDefinition/649.json
index 6a7574469e979c1d6e2b7fd45371694ce7f52456..d564f778dc98f930937c6348cd9dce981d89acdd 100644
--- a/data/json/SpellDefinition/649.json
+++ b/data/json/SpellDefinition/649.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 649,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/64908.json b/data/json/SpellDefinition/64908.json
index b3d725ae2c74388012d1145b7217deecd365c386..baf0feffa6a72c070f1ea7dd88c016785407a1dc 100644
--- a/data/json/SpellDefinition/64908.json
+++ b/data/json/SpellDefinition/64908.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 64908,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/65.json b/data/json/SpellDefinition/65.json
index 1c2fb64dbc9ec1f281c15203bfdcfda7bf394967..5e17a3ba6c6ef5ac4526493438fad8b6af5957dd 100644
--- a/data/json/SpellDefinition/65.json
+++ b/data/json/SpellDefinition/65.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 65,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/650.json b/data/json/SpellDefinition/650.json
index 499d659039189e9473924f21ea03261748d73744..8449ea136d7691102f016c3e343e1a20b45cf515 100644
--- a/data/json/SpellDefinition/650.json
+++ b/data/json/SpellDefinition/650.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 650,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": true,
       "families": [
-        8
+        8,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/651.json b/data/json/SpellDefinition/651.json
index af21f5cf864d16311450e53adb23d2d99c080cf0..76632ef1c275e9584bf9c77c8cc8dbaf75d43ee5 100644
--- a/data/json/SpellDefinition/651.json
+++ b/data/json/SpellDefinition/651.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 651,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/652.json b/data/json/SpellDefinition/652.json
index eacc23441b29de30028216a64b98036e8b757b8b..77f18451db53aaaf6b51cbbdd65dc1e5e0fc185d 100644
--- a/data/json/SpellDefinition/652.json
+++ b/data/json/SpellDefinition/652.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 652,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/653.json b/data/json/SpellDefinition/653.json
index b5175f7641bd4239ea5df3f9108cc4efa69f5b48..793190b5a699382a9b3ca401ca7743b78c996e08 100644
--- a/data/json/SpellDefinition/653.json
+++ b/data/json/SpellDefinition/653.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 653,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/65351.json b/data/json/SpellDefinition/65351.json
index ea4ce14b6aa50028897212bdc64cfad67b6067e9..ca23c1b3c90fee9870b9d6b04a2d33b7a7b2005e 100644
--- a/data/json/SpellDefinition/65351.json
+++ b/data/json/SpellDefinition/65351.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 65351,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/654.json b/data/json/SpellDefinition/654.json
index 82399e775e9754d10db13198b3aad178982eb882..4db4aba7a894c32a8fb1466608c1dbc27a5038dc 100644
--- a/data/json/SpellDefinition/654.json
+++ b/data/json/SpellDefinition/654.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 654,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -114,7 +115,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE TAURE - Charge Puissante",
diff --git a/data/json/SpellDefinition/65438.json b/data/json/SpellDefinition/65438.json
index 529fc9f3ca7083c929fcfc01311e907be44f293e..9df3ea55963df37b47fbe0708c409e17cb56554e 100644
--- a/data/json/SpellDefinition/65438.json
+++ b/data/json/SpellDefinition/65438.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 65438,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/65465.json b/data/json/SpellDefinition/65465.json
index 9df10c60b8b5333a899ab49a7493dde9034dc3d8..b4909cd4d7cb4da36f40a92128a0eb230d6975c0 100644
--- a/data/json/SpellDefinition/65465.json
+++ b/data/json/SpellDefinition/65465.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 65465,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -107,7 +108,8 @@
                 "referenceId": "",
                 "entitySelector": {
                   "type": "CasterHeroSelector"
-                }
+                },
+                "usePhysicalPower": true
               }
             }
           ]
@@ -175,7 +177,8 @@
             "referenceId": "",
             "entitySelector": {
               "type": "CasterHeroSelector"
-            }
+            },
+            "usePhysicalPower": true
           }
         }
       ],
diff --git a/data/json/SpellDefinition/655.json b/data/json/SpellDefinition/655.json
index 3d1ecf682729c623d15341b0589b7d9663df58f8..1597d141a1f2912e80686eba291e445cc8cf1454 100644
--- a/data/json/SpellDefinition/655.json
+++ b/data/json/SpellDefinition/655.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 655,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": true,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/656.json b/data/json/SpellDefinition/656.json
index f06c8c391c6026adb6c3e5c50dd223847b3cbb1a..8c53f7e066f35dc736eb7c71b96ac97d41091c8b 100644
--- a/data/json/SpellDefinition/656.json
+++ b/data/json/SpellDefinition/656.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 656,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -91,21 +92,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 23.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/657.json b/data/json/SpellDefinition/657.json
index 650afb05900538c5d7969beee45338784ceaf113..5ef6c73ca293f3da9736fda9fe95d44a9bde95de 100644
--- a/data/json/SpellDefinition/657.json
+++ b/data/json/SpellDefinition/657.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 657,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -78,6 +85,7 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
+        "WAKFU",
         "UNIQUE",
         {
           "type": 4,
diff --git a/data/json/SpellDefinition/658.json b/data/json/SpellDefinition/658.json
index 0944a65af49093d4b836768de3b31fed674acb0e..ab3d030958cdeee83b6834b6a1ea7672121b99f6 100644
--- a/data/json/SpellDefinition/658.json
+++ b/data/json/SpellDefinition/658.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 658,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/659.json b/data/json/SpellDefinition/659.json
index 103f626020164d2ca04612cf7051ea8481156134..c5d2dc5a106e88e36d6e3d7c5c8a208039df0305 100644
--- a/data/json/SpellDefinition/659.json
+++ b/data/json/SpellDefinition/659.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 659,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/65910.json b/data/json/SpellDefinition/65910.json
index 4654c29640291916e1de0072b7f5e7a44add1ede..485b0df6604923d1b114dffa37d24248ded1f9fe 100644
--- a/data/json/SpellDefinition/65910.json
+++ b/data/json/SpellDefinition/65910.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 65910,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -20,7 +27,7 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 3
+          "value": 2
         }
       }
     ],
@@ -30,10 +37,34 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 20
+          "value": 2
         }
       }
     ],
+    "castCondition": {
+      "type": "ConditionalCastCondition",
+      "condition": {
+        "type": "CaracValueCondition",
+        "selector": {
+          "type": "CasterSelector"
+        },
+        "carac": 20,
+        "value": {
+          "type": "GreaterEqualThan",
+          "dynamicValue": {
+            "type": "ConstIntegerValue",
+            "referenceId": "Wakfu",
+            "value": 15
+          }
+        }
+      },
+      "ifTrue": {
+        "type": "SuccessCastCondition"
+      },
+      "ifFalse": {
+        "type": "FailureCastCondition"
+      }
+    },
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
@@ -57,8 +88,6 @@
     ],
     "eventsInvalidatingTooltip": [
       2,
-      8,
-      9,
       10,
       11
     ],
@@ -67,8 +96,13 @@
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "dr",
-          "value": 20
+          "referenceId": "Wakfu",
+          "value": 15
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "valueB",
+          "value": 10
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/66.json b/data/json/SpellDefinition/66.json
index 8497bd87f15abb519654914ec43427eda494d75a..91454a5434a248f82b56755d0ebc6009f3055e25 100644
--- a/data/json/SpellDefinition/66.json
+++ b/data/json/SpellDefinition/66.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 66,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -155,21 +156,21 @@
           "value": 2
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
-          "baseValue": 27.9,
+          "baseValue": 26.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
-          "baseValue": 30.9,
+          "baseValue": 29.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -184,7 +185,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE CHAFER - Charge Crâneuse",
diff --git a/data/json/SpellDefinition/661.json b/data/json/SpellDefinition/661.json
index a274c8ec93b0eb5c5c5dcc716f5a115651d86c42..3b22e5758313fef2e0d7717d28475811785201c5 100644
--- a/data/json/SpellDefinition/661.json
+++ b/data/json/SpellDefinition/661.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 661,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/662.json b/data/json/SpellDefinition/662.json
index cc11ce304b5333bfb38dce3b7262d750fa1e52fd..1b1dc8766d6b522ba03e963450663b8bc0348732 100644
--- a/data/json/SpellDefinition/662.json
+++ b/data/json/SpellDefinition/662.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 662,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,7 +44,7 @@
     "spellEffectData": [
       {
         "type": "SpellEffectInstantiationData",
-        "spellEffect": "381203b4e09bdbc4cba795bffe224b88",
+        "spellEffect": "39be521cc8ebf664580339f8b035428a",
         "originTarget": {
           "type": "FirstCastTargetSelector"
         }
diff --git a/data/json/SpellDefinition/66464.json b/data/json/SpellDefinition/66464.json
index b2cdb72c9bbef0b8351eba042724838a5a935f36..18cf83b11253f495e478573b77fa1c16fb8102f0 100644
--- a/data/json/SpellDefinition/66464.json
+++ b/data/json/SpellDefinition/66464.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 66464,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,14 +44,8 @@
     "castTarget": {
       "type": "TwoCastTargetDefinition",
       "selector1": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
+        "type": "FilteredCharacterSelector",
         "filters": [
-          {
-            "type": "CharacterEntityFilter"
-          },
           {
             "type": "TeamFilter",
             "isIdentical": true,
diff --git a/data/json/SpellDefinition/6647.json b/data/json/SpellDefinition/6647.json
index fd3e8a31cbc143b4c007185b5535ceaec3a7d6a9..c81bb3bd7abb977af2fbf035ca164276d6acd5be 100644
--- a/data/json/SpellDefinition/6647.json
+++ b/data/json/SpellDefinition/6647.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 6647,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/66509.json b/data/json/SpellDefinition/66509.json
index 3b18a85035a04cc81f3d6b994f88384819d1eb04..10b5aeed03aaacd2df303f1a554f27b308013138 100644
--- a/data/json/SpellDefinition/66509.json
+++ b/data/json/SpellDefinition/66509.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 66509,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -38,17 +45,7 @@
       "type": "OneCastTargetDefinition",
       "selector": {
         "type": "FilteredCharacterSelector",
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "filters": []
       }
     },
     "spellEffectData": [
@@ -83,6 +80,11 @@
           "type": "ConstIntegerValue",
           "referenceId": "boost",
           "value": 4
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "valueWakfu",
+          "value": 2
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/666.json b/data/json/SpellDefinition/666.json
index 75540a8ad93d1eddecafaaf8bf81da3fb159ac5a..add00c521d86b0f970540b20869824a583cb8742 100644
--- a/data/json/SpellDefinition/666.json
+++ b/data/json/SpellDefinition/666.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 666,
+    "merchantCosts": [],
     "tags": [
       4
     ],
diff --git a/data/json/SpellDefinition/66687.json b/data/json/SpellDefinition/66687.json
index 83b8758f538a0216466589760aba95c6cb66c6b1..e9438cc9cc6c98e17e05f11d5319eb55e8f6753e 100644
--- a/data/json/SpellDefinition/66687.json
+++ b/data/json/SpellDefinition/66687.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 66687,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              3,
-              2
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/66688.json b/data/json/SpellDefinition/66688.json
index 9d979c42ceedaa027af275eb64c2f6ab567b6a52..a720b243d1b794dae09f0c8c8a4d74e4eb443935 100644
--- a/data/json/SpellDefinition/66688.json
+++ b/data/json/SpellDefinition/66688.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 66688,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/667.json b/data/json/SpellDefinition/667.json
index eb59862457424aa3407b3787b169e2aa4fa31ae3..35b67d663c7487594552901dfb2e65fe6d8f4612 100644
--- a/data/json/SpellDefinition/667.json
+++ b/data/json/SpellDefinition/667.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 667,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/668.json b/data/json/SpellDefinition/668.json
index 443ca384de7961f498d6aebccf912188523ef225..15e8cbaf89a5bf320f9358175d75c90d006cc8ae 100644
--- a/data/json/SpellDefinition/668.json
+++ b/data/json/SpellDefinition/668.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 668,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/66833.json b/data/json/SpellDefinition/66833.json
index 42e2884c6353655b064acc1dcf400d58a65df5d4..34300e928b61e915c3276220269445f38cce4411 100644
--- a/data/json/SpellDefinition/66833.json
+++ b/data/json/SpellDefinition/66833.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 66833,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -20,7 +27,7 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 2
+          "value": 1
         }
       }
     ],
@@ -30,7 +37,7 @@
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 5
+          "value": 3
         }
       }
     ],
@@ -87,6 +94,11 @@
           "type": "ConstIntegerValue",
           "referenceId": "boost",
           "value": 30
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "valueWakfu",
+          "value": 1
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/669.json b/data/json/SpellDefinition/669.json
index 754a8240844aaa30017f3a56975ed6c4436b0165..ffe33f9d118269b84867b72d357d75d5efbe9bb8 100644
--- a/data/json/SpellDefinition/669.json
+++ b/data/json/SpellDefinition/669.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 669,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -72,12 +73,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 20.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/672.json b/data/json/SpellDefinition/672.json
index 541238ab24e56361154a7496c12d6bebad2ad1f2..2e7d69464d9b247cb2390a9bdc36d062cf27bdae 100644
--- a/data/json/SpellDefinition/672.json
+++ b/data/json/SpellDefinition/672.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 672,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/67282.json b/data/json/SpellDefinition/67282.json
index f2c9c0b1f00575f13eca4bf825a5ebcf9e2a15f5..4677b97baf2771339933c4860859c33c87bf8aca 100644
--- a/data/json/SpellDefinition/67282.json
+++ b/data/json/SpellDefinition/67282.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 67282,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/67386.json b/data/json/SpellDefinition/67386.json
index 03e2e13a90d84d5675608c46d86713d7d8354443..59197b535be946f7a2f140283a66f965942d88be 100644
--- a/data/json/SpellDefinition/67386.json
+++ b/data/json/SpellDefinition/67386.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 67386,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/67393.json b/data/json/SpellDefinition/67393.json
index e4d573563298a575afc11d90622fa06615013225..3a546b4f4dc5bc684bcafe5e450a4d0e9078cdc0 100644
--- a/data/json/SpellDefinition/67393.json
+++ b/data/json/SpellDefinition/67393.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 67393,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -71,21 +78,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/674.json b/data/json/SpellDefinition/674.json
index b7d3f69118c95227deb3268c7a248f569f523f4d..0b4841b1278b3f5ce472808148f6a577ca6a2e59 100644
--- a/data/json/SpellDefinition/674.json
+++ b/data/json/SpellDefinition/674.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 674,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/67420.json b/data/json/SpellDefinition/67420.json
index 6edb7391cd8ddc9520bc2b8769e9987dd48a6e49..86e8b59e1d8eb5c66b044a06b36e6fac97481dd4 100644
--- a/data/json/SpellDefinition/67420.json
+++ b/data/json/SpellDefinition/67420.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 67420,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/675.json b/data/json/SpellDefinition/675.json
index 90f6661e07d6cc079bfab9609383c002f775bf96..6b37d68b47d00b315eb8effa89475926c87c2b9d 100644
--- a/data/json/SpellDefinition/675.json
+++ b/data/json/SpellDefinition/675.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 675,
+    "merchantCosts": [],
     "tags": [
       1
     ],
diff --git a/data/json/SpellDefinition/677.json b/data/json/SpellDefinition/677.json
index 6c02563e6d18b4c183bcb968af74b7fbcfe3678b..61f8d744fd76b5b01e406bf6d4eea5aed4974708 100644
--- a/data/json/SpellDefinition/677.json
+++ b/data/json/SpellDefinition/677.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 677,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/678.json b/data/json/SpellDefinition/678.json
index 912604345075eb73c797ac7c8763096c80c51952..099e9eb8dc0e2d9c9cfaea203ae9623b123cc3a4 100644
--- a/data/json/SpellDefinition/678.json
+++ b/data/json/SpellDefinition/678.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 678,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 20
+          "value": 19
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "SRAM - Peur du Noir",
diff --git a/data/json/SpellDefinition/679.json b/data/json/SpellDefinition/679.json
index 50f0b59bd871832a4c4444b7d811844201c0aab1..02fa47a65d4caeda2da74527f3eafcf8041269bf 100644
--- a/data/json/SpellDefinition/679.json
+++ b/data/json/SpellDefinition/679.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 679,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 15.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/68.json b/data/json/SpellDefinition/68.json
index fadb22641bddab63734eea1e10a89ad6dae7fd4e..ef00870da9560ba042eaf30e379c50a275b1e93b 100644
--- a/data/json/SpellDefinition/68.json
+++ b/data/json/SpellDefinition/68.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 68,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [],
diff --git a/data/json/SpellDefinition/680.json b/data/json/SpellDefinition/680.json
index aef03d7c935cedd0966d1e5c7f4df768a2fa3fb9..d50823974915b1c8ce828b72951fe9411c092e38 100644
--- a/data/json/SpellDefinition/680.json
+++ b/data/json/SpellDefinition/680.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 680,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -77,21 +78,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 21.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/68052.json b/data/json/SpellDefinition/68052.json
index 151a12b56e2dc594407a2dbf64545cbd6f7d4e32..61874f1e209a991d779e40a06ccdcb8ef512395b 100644
--- a/data/json/SpellDefinition/68052.json
+++ b/data/json/SpellDefinition/68052.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 68052,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -38,16 +45,16 @@
         "type": "FilteredCoordSelector",
         "filters": [
           {
-            "type": "AroundTargetFilter",
+            "type": "InLineTargetFilter",
             "targetsToCompare": {
               "type": "CasterHeroSelector"
             },
             "distance": {
-              "type": "EqualsTo",
+              "type": "LowerEqualThan",
               "dynamicValue": {
                 "type": "ConstIntegerValue",
                 "referenceId": "",
-                "value": 1
+                "value": 3
               }
             }
           }
diff --git a/data/json/SpellDefinition/681.json b/data/json/SpellDefinition/681.json
index 0b8253625cb8742ef65c7aafa9c4407676a591b7..a105195396e8993ed1d585e619ed9efd04d04dc4 100644
--- a/data/json/SpellDefinition/681.json
+++ b/data/json/SpellDefinition/681.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 681,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/68132.json b/data/json/SpellDefinition/68132.json
index 74436d43565e86c2fc43f58cb17a34d21e47b8bd..fcd9bc038bce9372856c4f0371bb8c08e736aaaf 100644
--- a/data/json/SpellDefinition/68132.json
+++ b/data/json/SpellDefinition/68132.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 68132,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/682.json b/data/json/SpellDefinition/682.json
index dd06704e19b43d97a88c5d92f5c657c5f69587d6..8f5007808aad3ae01671ce539e5782b3bfa9a804 100644
--- a/data/json/SpellDefinition/682.json
+++ b/data/json/SpellDefinition/682.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 682,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/6821.json b/data/json/SpellDefinition/6821.json
index fe6fe4ad00e9445ca906d9745b225a3367fd402c..6636d632cb4ead680a723f13114f2023136958fc 100644
--- a/data/json/SpellDefinition/6821.json
+++ b/data/json/SpellDefinition/6821.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 6821,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/68278.json b/data/json/SpellDefinition/68278.json
index df4ad01a78a8b245bfbc817acbd5cc8171dfa9f5..a4bfa036af28a578cb788d5522e6fb4bb79c7a37 100644
--- a/data/json/SpellDefinition/68278.json
+++ b/data/json/SpellDefinition/68278.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 68278,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/685.json b/data/json/SpellDefinition/685.json
index 4bbc7daa3c80f7ef485f8fafb9343c4eb49e15a1..2878e944d4c1db5685ff58741cedb6e336c72d97 100644
--- a/data/json/SpellDefinition/685.json
+++ b/data/json/SpellDefinition/685.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 685,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        3
+        3,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/686.json b/data/json/SpellDefinition/686.json
index f40238172d501c513a90b87339fedea3a692a970..1b039c8b1071e3d941ad617b1728cf68adb53454 100644
--- a/data/json/SpellDefinition/686.json
+++ b/data/json/SpellDefinition/686.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 686,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -41,48 +42,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 14
+          "value": 13
         },
         {
           "type": "ConstIntegerValue",
@@ -125,7 +101,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "SRAM - Pulsion",
diff --git a/data/json/SpellDefinition/68622.json b/data/json/SpellDefinition/68622.json
index 90ad83f9edee349d201e5335b46851ab86de9eb8..e1091f769aa74af880762de5aff2a8c655d61ebc 100644
--- a/data/json/SpellDefinition/68622.json
+++ b/data/json/SpellDefinition/68622.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 68622,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/687.json b/data/json/SpellDefinition/687.json
index b9194d2c383fdc96043ebf874842276ae2054ed9..665be8de4dafbcde471a15feeadd023492943326 100644
--- a/data/json/SpellDefinition/687.json
+++ b/data/json/SpellDefinition/687.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 687,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -112,21 +113,21 @@
           "value": 4
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 3.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/68796.json b/data/json/SpellDefinition/68796.json
index 170d2ce02644af5870ddb0b6573fbf97bd642d19..4cb478b7ff692073c0c9dd41d8434838bf23ea7b 100644
--- a/data/json/SpellDefinition/68796.json
+++ b/data/json/SpellDefinition/68796.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 68796,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/688.json b/data/json/SpellDefinition/688.json
index b7a70b728cf99d11ebcc16e253a44cb86208468d..2aa165528d7ecbd2ab3a6ba9b8ca7e5768c65a50 100644
--- a/data/json/SpellDefinition/688.json
+++ b/data/json/SpellDefinition/688.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 688,
+    "merchantCosts": [],
     "tags": [
       7
     ],
diff --git a/data/json/SpellDefinition/69.json b/data/json/SpellDefinition/69.json
index a266a384e0efb9538e7395fd5bfbf8b3290b58e0..cccc6e9ba5a725efdc98f2c797a78bd08520113f 100644
--- a/data/json/SpellDefinition/69.json
+++ b/data/json/SpellDefinition/69.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 69,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/690.json b/data/json/SpellDefinition/690.json
index 320fcc7feef5bab145be8e1f8bb65f3f79db7863..168370501b3ef99e3585bbc7393ee39322024dd8 100644
--- a/data/json/SpellDefinition/690.json
+++ b/data/json/SpellDefinition/690.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 690,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/691.json b/data/json/SpellDefinition/691.json
index 5e55ba2f71272a7b66d5cb2063033b19cbd873b5..5294fc25d58cfcb870cc6da685f238d90f7597e2 100644
--- a/data/json/SpellDefinition/691.json
+++ b/data/json/SpellDefinition/691.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 691,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -91,21 +92,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 11.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 11.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/69119.json b/data/json/SpellDefinition/69119.json
index 066f20458f236b5f4470c2838809bf1e5e12cb17..75d4a9da41da77c74a4cc2bd00e6340302814728 100644
--- a/data/json/SpellDefinition/69119.json
+++ b/data/json/SpellDefinition/69119.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 69119,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/692.json b/data/json/SpellDefinition/692.json
index 247c6933b8d3f96c4192a71cf359380b2d8f133d..fd9afddf5ef7b93b6a6d00ff64a22216de49b108 100644
--- a/data/json/SpellDefinition/692.json
+++ b/data/json/SpellDefinition/692.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 692,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/693.json b/data/json/SpellDefinition/693.json
index 91fafb44f0f6963209427b30c0149950c996f01c..8d42818f008861d1e1bc3095ba40dcefc1b69e35 100644
--- a/data/json/SpellDefinition/693.json
+++ b/data/json/SpellDefinition/693.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 693,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,21 +55,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 16.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/694.json b/data/json/SpellDefinition/694.json
index bbd1daf664d1d76729ae9f2b1eac6ca11f89523f..3374f7f5be4cd2d174b8051f34e6abe4c54bf50b 100644
--- a/data/json/SpellDefinition/694.json
+++ b/data/json/SpellDefinition/694.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 694,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -65,30 +66,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 4.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/695.json b/data/json/SpellDefinition/695.json
index f62559790101e42b17f39f95992f5c4cdc1935cf..35e8f79796f1285694127369532c00bdff0ca0b4 100644
--- a/data/json/SpellDefinition/695.json
+++ b/data/json/SpellDefinition/695.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 695,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/696.json b/data/json/SpellDefinition/696.json
index 142e9da054df8ec1a5c2af9d632c42287d7b4a33..a3d8a3ee066bca46d2b62ce479ce30d955f4287e 100644
--- a/data/json/SpellDefinition/696.json
+++ b/data/json/SpellDefinition/696.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 696,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,21 +53,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 19.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "DMG",
           "baseValue": 24.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/69602.json b/data/json/SpellDefinition/69602.json
index 86f95cb08da231c0ae5a45f59675a4f94ef1c2e4..a484e794324d555a99f88653a4d9a2fb23e596f9 100644
--- a/data/json/SpellDefinition/69602.json
+++ b/data/json/SpellDefinition/69602.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 69602,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/69663.json b/data/json/SpellDefinition/69663.json
index 964e4a24bdd75d501445cac3ef3971fc4e808de1..92c2a7ea380c074eebad15487de509cef51d1bfe 100644
--- a/data/json/SpellDefinition/69663.json
+++ b/data/json/SpellDefinition/69663.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 69663,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/697.json b/data/json/SpellDefinition/697.json
index 2c30321978a39e201b2c3fe1829c9d774be14b2a..2ae5c64701378e17487bf3434093d70dd07268f2 100644
--- a/data/json/SpellDefinition/697.json
+++ b/data/json/SpellDefinition/697.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 697,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,31 +64,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 16.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": -14.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": -70
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/7.json b/data/json/SpellDefinition/7.json
index 56780d376691fc79995b77b1df3f98da42dd5beb..21b6710b91dc09265b4e9af2021227a67f161e26 100644
--- a/data/json/SpellDefinition/7.json
+++ b/data/json/SpellDefinition/7.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 7,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,21 +57,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/70.json b/data/json/SpellDefinition/70.json
index bbf2549f7058fef72018290d2f6e03a3607c8f24..2c3b6c083814b8ae496e768bdc4ff557c14437a3 100644
--- a/data/json/SpellDefinition/70.json
+++ b/data/json/SpellDefinition/70.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 70,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -52,21 +53,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 12.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/700.json b/data/json/SpellDefinition/700.json
index 87666a9cf6abdb57349ba95f8a46cea9a350da08..16161047903a95ebda143de8d1eafe51cb7823af 100644
--- a/data/json/SpellDefinition/700.json
+++ b/data/json/SpellDefinition/700.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 700,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/701.json b/data/json/SpellDefinition/701.json
index dd60ffa508996f274503c03bf62567857a2d1b92..d9038e09691f43a01aa69a1539167f75a5665db5 100644
--- a/data/json/SpellDefinition/701.json
+++ b/data/json/SpellDefinition/701.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 701,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -93,49 +94,36 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 18.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 22.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min2",
-          "baseValue": 6.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "max2",
-          "baseValue": 8.4,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 50
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/70245.json b/data/json/SpellDefinition/70245.json
index 025a196e5427af784466ce4e7e7c061d9a0cf8bb..2176eab2f70a064c6a0c863d4ff645b3dbd0a349 100644
--- a/data/json/SpellDefinition/70245.json
+++ b/data/json/SpellDefinition/70245.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 70245,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/705.json b/data/json/SpellDefinition/705.json
index 6faacbaff1f1a4587652d7aaa60157165d866210..e263418632f975ac668fcbf20a65fc05c3eb3b67 100644
--- a/data/json/SpellDefinition/705.json
+++ b/data/json/SpellDefinition/705.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 705,
+    "merchantCosts": [],
     "tags": [
       0
     ],
diff --git a/data/json/SpellDefinition/706.json b/data/json/SpellDefinition/706.json
index e6d0a5cabfa6b09d16313da6426358d53fd1c037..53dc24dba127734e49325286c666a4d2d2787ebe 100644
--- a/data/json/SpellDefinition/706.json
+++ b/data/json/SpellDefinition/706.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 706,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/707.json b/data/json/SpellDefinition/707.json
index 40594ee141eebb959dfec2d57b829ab941ccb055..5fbb6760563c6ea0f114ab18e112504543999dec 100644
--- a/data/json/SpellDefinition/707.json
+++ b/data/json/SpellDefinition/707.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 707,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/70738.json b/data/json/SpellDefinition/70738.json
index 96667563f5a8eb9e2afeb18266117b00457f2923..588791ef2d318f113aad12b5b2b479fa17a11657 100644
--- a/data/json/SpellDefinition/70738.json
+++ b/data/json/SpellDefinition/70738.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 70738,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/70744.json b/data/json/SpellDefinition/70744.json
index 70ddf1aa4b510eb74d4f10be85c185b16dc6140b..9b1890fd63e983ac3b4cc935cef40bd9c47026bb 100644
--- a/data/json/SpellDefinition/70744.json
+++ b/data/json/SpellDefinition/70744.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 70744,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/70760.json b/data/json/SpellDefinition/70760.json
index 89b0bf4c79d6d9b618afcff74f7dda0a92cc0ad6..ec6d7da3950f341b8074eb098f3c25a1d28ac93c 100644
--- a/data/json/SpellDefinition/70760.json
+++ b/data/json/SpellDefinition/70760.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 70760,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
@@ -37,26 +44,7 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1
-            ]
-          },
-          {
-            "type": "TeamFilter",
-            "isIdentical": true,
-            "reference": {
-              "type": "CasterSelector"
-            }
-          }
-        ]
+        "type": "CasterHeroSelector"
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/708.json b/data/json/SpellDefinition/708.json
index c8c28978df3ceaf4cd71a26a3b7e5f2c5a301d0e..1a2b4e79f7ddf0a3237ef637cfd5dd0dbef479a2 100644
--- a/data/json/SpellDefinition/708.json
+++ b/data/json/SpellDefinition/708.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 708,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/71.json b/data/json/SpellDefinition/71.json
index 18a21a5bca91317c5feb9bc3d9022c077c8bf913..9bab2128bcda2c930d3413cc9901553bfd054463 100644
--- a/data/json/SpellDefinition/71.json
+++ b/data/json/SpellDefinition/71.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 71,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/710.json b/data/json/SpellDefinition/710.json
index b972b52a59e7898719698ecd15c5e90487b10bc8..c2c0937df7aca2979ce7dea3b2fa19364a18d200 100644
--- a/data/json/SpellDefinition/710.json
+++ b/data/json/SpellDefinition/710.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 710,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        0
+        0,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/711.json b/data/json/SpellDefinition/711.json
index f5c5b89d3f1d9aa2121c27485e8432c8fca58856..00e6c4a47f1652f23a46c36d43e3fe3fd9fdb190 100644
--- a/data/json/SpellDefinition/711.json
+++ b/data/json/SpellDefinition/711.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 711,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -101,6 +102,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         {
           "type": 4,
           "id": 120
diff --git a/data/json/SpellDefinition/71387.json b/data/json/SpellDefinition/71387.json
index fce39c15a4be11001f46f8ee4526d146c30d7e14..257d7799122ab673b2ad61d4cb1fd2e95e2ac748 100644
--- a/data/json/SpellDefinition/71387.json
+++ b/data/json/SpellDefinition/71387.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 71387,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/716.json b/data/json/SpellDefinition/716.json
index 1ae6d188e2c735acc5a2ca6798b46f6a18a743f7..c0021589ace0111d92740b66364f7676ba03f8a1 100644
--- a/data/json/SpellDefinition/716.json
+++ b/data/json/SpellDefinition/716.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 716,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/71600.json b/data/json/SpellDefinition/71600.json
index bde29b3ecc77318e20a58e2f57bf7c4e588fdc9d..ad6cca6bbeda3d79f9d874d7f2a17e3d2e1cba84 100644
--- a/data/json/SpellDefinition/71600.json
+++ b/data/json/SpellDefinition/71600.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 71600,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/717.json b/data/json/SpellDefinition/717.json
index 710610c8a2fcadb648e6039863153badc5b6c67d..04cbb72647eabba757b628045bc3a4159984d3c7 100644
--- a/data/json/SpellDefinition/717.json
+++ b/data/json/SpellDefinition/717.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 717,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/718.json b/data/json/SpellDefinition/718.json
index bd73455893630d2a65bd980944270b445bceff66..250a773c9f677e1c7497f8c7627cc0450f862f33 100644
--- a/data/json/SpellDefinition/718.json
+++ b/data/json/SpellDefinition/718.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 718,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/719.json b/data/json/SpellDefinition/719.json
index a3bc3d09822b225727e2f1039b17be8a269a12a8..c8f9645a44eb7e31e51b0c88cf6e51420791a9de 100644
--- a/data/json/SpellDefinition/719.json
+++ b/data/json/SpellDefinition/719.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 719,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/71938.json b/data/json/SpellDefinition/71938.json
index 640a47ff77f22c2a4dc7ef1607f58792b3ad304c..f8e9f53d7cfc244cdd1728d2ba1a5c7a5143e41a 100644
--- a/data/json/SpellDefinition/71938.json
+++ b/data/json/SpellDefinition/71938.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 71938,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,7 +62,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 10
+          "value": 60
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/720.json b/data/json/SpellDefinition/720.json
index c97ffaa6e7903a27afb13c9a65da0994fe8ca9bc..e8ac1bd4b8dc0d92304bd3451e05af95aded3286 100644
--- a/data/json/SpellDefinition/720.json
+++ b/data/json/SpellDefinition/720.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 720,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/721.json b/data/json/SpellDefinition/721.json
index 725bb3b73c62ae0f75d65f1543ecd0520853b8d3..8e016c356ea85dc0e5ff05c357ec97fee8696d12 100644
--- a/data/json/SpellDefinition/721.json
+++ b/data/json/SpellDefinition/721.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 721,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/722.json b/data/json/SpellDefinition/722.json
index 5f4d5e783c1a853ce7c0eb9b5454060b7cb09a19..793d9b62febe2a2acf3be35bb4540f7d174982f2 100644
--- a/data/json/SpellDefinition/722.json
+++ b/data/json/SpellDefinition/722.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 722,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/723.json b/data/json/SpellDefinition/723.json
index 6442e8565e26c90d0ff5aafd65b43336577bf418..5c9c0ab45e776e81d94b194fb36b75e34401234a 100644
--- a/data/json/SpellDefinition/723.json
+++ b/data/json/SpellDefinition/723.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 723,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -104,13 +105,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 4.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/724.json b/data/json/SpellDefinition/724.json
index b2c46fc2a33fc548a732392fb86f934316e7ebf0..b2de6eed89740f42013bd07e515365ff9b2c833b 100644
--- a/data/json/SpellDefinition/724.json
+++ b/data/json/SpellDefinition/724.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 724,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/725.json b/data/json/SpellDefinition/725.json
index 0da15a36c8b9145c2e99fbc7a0f270cc99df6b55..1403a11af64dfd4846cdbe6b55ccd768936f89da 100644
--- a/data/json/SpellDefinition/725.json
+++ b/data/json/SpellDefinition/725.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 725,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/726.json b/data/json/SpellDefinition/726.json
index 40f2b33039ed23f32b83942ed7e05147f1ef91b8..27fbf8086f0bc6c8156530002c1b4af6bfe2f1d0 100644
--- a/data/json/SpellDefinition/726.json
+++ b/data/json/SpellDefinition/726.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 726,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/72615.json b/data/json/SpellDefinition/72615.json
index 2050663bf68e64bf43764bf9391d573fbe34c96c..e71f03e39030baa0163db0a645108c82fd70dd27 100644
--- a/data/json/SpellDefinition/72615.json
+++ b/data/json/SpellDefinition/72615.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 72615,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/72624.json b/data/json/SpellDefinition/72624.json
index 3af0fe69ce31dd4aaa4ff855420cef9ed10a56be..1937ec342970f0e21aff100b1f5e626109f4890d 100644
--- a/data/json/SpellDefinition/72624.json
+++ b/data/json/SpellDefinition/72624.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 72624,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/727.json b/data/json/SpellDefinition/727.json
index 1b172a4993ceaaf784a751baec9383c9d91eef88..c8e1ac802564ba3555bad04392be09614b91db49 100644
--- a/data/json/SpellDefinition/727.json
+++ b/data/json/SpellDefinition/727.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 727,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/728.json b/data/json/SpellDefinition/728.json
index 746ed6fe70d50110667f154627e135c487ef479e..bc1202fcdf7e1f970015de3fab12ebeaacb0fc6b 100644
--- a/data/json/SpellDefinition/728.json
+++ b/data/json/SpellDefinition/728.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 728,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/729.json b/data/json/SpellDefinition/729.json
index 9bbd63e1a591a15171af6cae474edd4a6e171671..664c2e0e433eddf247a1664e68d7da883a333d64 100644
--- a/data/json/SpellDefinition/729.json
+++ b/data/json/SpellDefinition/729.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 729,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -122,13 +123,13 @@
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 2
+          "referenceId": "dmg",
+          "value": 18
         },
         {
           "type": "ConstIntegerValue",
-          "referenceId": "dmg",
-          "value": 20
+          "referenceId": "c",
+          "value": 2
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/73.json b/data/json/SpellDefinition/73.json
index 7e272efc86bf2d2e604f6198386126fdbee6cdd2..284a3275349dd1afa0455a0a4e00035c39fb833f 100644
--- a/data/json/SpellDefinition/73.json
+++ b/data/json/SpellDefinition/73.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 73,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/730.json b/data/json/SpellDefinition/730.json
index e2d0b9c9484b6a455f2d8b6e7e2bc70c4d259b59..8528c3bf7331dbab66e8e5d9496bde98f0bfc60c 100644
--- a/data/json/SpellDefinition/730.json
+++ b/data/json/SpellDefinition/730.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 730,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/731.json b/data/json/SpellDefinition/731.json
index de08330ba50989d5b56b0c533ab3ff95dac5eab5..da49bf4ce16bc6ac427d2c80194a84f088d24505 100644
--- a/data/json/SpellDefinition/731.json
+++ b/data/json/SpellDefinition/731.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 731,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -34,6 +35,16 @@
         }
       }
     ],
+    "castCondition": {
+      "type": "UniqueForCasterTeamCondition",
+      "specificEntity": {
+        "type": "SummoningDefinitionFilter",
+        "condition": 1,
+        "summonings": [
+          204
+        ]
+      }
+    },
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
@@ -59,7 +70,15 @@
         ]
       }
     },
-    "spellEffectData": [],
+    "spellEffectData": [
+      {
+        "type": "SpellEffectInstantiationData",
+        "spellEffect": "0d9700b5de820314f8d2e3ddf4fdbb9d",
+        "originTarget": {
+          "type": "FirstCastTargetSelector"
+        }
+      }
+    ],
     "eventsInvalidatingCost": [
       2
     ],
@@ -84,11 +103,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
+        "WAVE",
+        "UNIQUE",
         {
           "type": 4,
           "id": 204
diff --git a/data/json/SpellDefinition/732.json b/data/json/SpellDefinition/732.json
index ada0a706b44d191c569057b443afa0e629a3de4c..91ad68b2a035597bef0653c3dd85eb3eac18552f 100644
--- a/data/json/SpellDefinition/732.json
+++ b/data/json/SpellDefinition/732.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 732,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/733.json b/data/json/SpellDefinition/733.json
index f2458ff8d1e79ecfd4126edc535b4dff086ffb45..c5bdcba99d140a39b10be50099d2853a6a8f33ef 100644
--- a/data/json/SpellDefinition/733.json
+++ b/data/json/SpellDefinition/733.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 733,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/73300.json b/data/json/SpellDefinition/73300.json
index 11465447ba5a9e9875d065a3e11b6791355198dd..e277604f39b628859530c471ad5e9eeef27cca41 100644
--- a/data/json/SpellDefinition/73300.json
+++ b/data/json/SpellDefinition/73300.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 73300,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/734.json b/data/json/SpellDefinition/734.json
index 0111c9487f7da4ab2ab0e96329094b5003d0b2da..ca8e718da381a47b1fcaab38cc75330472854ac6 100644
--- a/data/json/SpellDefinition/734.json
+++ b/data/json/SpellDefinition/734.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 734,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/735.json b/data/json/SpellDefinition/735.json
index 8b40dea6c5dc66574c12265ee891e9cdbc985093..5552fa0f608721a14cc63948d20beef5a22b87d1 100644
--- a/data/json/SpellDefinition/735.json
+++ b/data/json/SpellDefinition/735.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 735,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/7353.json b/data/json/SpellDefinition/7353.json
index 7364b9addc83d3ca6ea5f9f5088be0f683174d69..b5fe31fdfe4136d548ff616e77b8039a3394de8c 100644
--- a/data/json/SpellDefinition/7353.json
+++ b/data/json/SpellDefinition/7353.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 7353,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/73558.json b/data/json/SpellDefinition/73558.json
index a943cc818455a5dded91ae9050d1038b1995c5fe..7e8ce89a94fbbe236f927b750c0ba0eff32f43b0 100644
--- a/data/json/SpellDefinition/73558.json
+++ b/data/json/SpellDefinition/73558.json
@@ -4,25 +4,36 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 73558,
+    "merchantCosts": [],
     "tags": [
       10
     ],
     "details": {
       "type": "SpellDetails",
-      "element": 4,
-      "equipable": true,
+      "element": 6,
+      "equipable": false,
       "families": [
         7
       ]
     },
-    "gaugeToModifyOnSpellPlay": [],
+    "gaugeToModifyOnSpellPlay": [
+      {
+        "type": "GaugeValue",
+        "element": 57,
+        "value": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1
+        }
+      }
+    ],
     "costs": [
       {
         "type": "ActionPointsCost",
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 13
+          "value": 8
         }
       }
     ],
@@ -90,7 +101,6 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "LIGHTNING",
         "MECHANISM",
         {
           "type": 7,
@@ -100,10 +110,10 @@
     }
   },
   "m_displayName": "XELOR - Xelocube Solaire",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 19895,
   "m_i18nDescriptionId": 7020,
   "m_elementaryStates": 1,
-  "assetGuid": "",
+  "assetGuid": "1d88ff119948c2b45a7f4534a7756b20",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/736.json b/data/json/SpellDefinition/736.json
index 47450a9e2bbedd14f54bd2f438bae29ff840a3a2..34a157b1412a3a571272df10e896215f16b665e2 100644
--- a/data/json/SpellDefinition/736.json
+++ b/data/json/SpellDefinition/736.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 736,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/73656.json b/data/json/SpellDefinition/73656.json
index beb1766fef702ac6f665f0322703a6645590213b..bdec70459181f6bf99069ee801fb682630887ad0 100644
--- a/data/json/SpellDefinition/73656.json
+++ b/data/json/SpellDefinition/73656.json
@@ -4,25 +4,36 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 73656,
+    "merchantCosts": [],
     "tags": [
       10
     ],
     "details": {
       "type": "SpellDetails",
-      "element": 4,
-      "equipable": true,
+      "element": 6,
+      "equipable": false,
       "families": [
         7
       ]
     },
-    "gaugeToModifyOnSpellPlay": [],
+    "gaugeToModifyOnSpellPlay": [
+      {
+        "type": "GaugeValue",
+        "element": 57,
+        "value": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1
+        }
+      }
+    ],
     "costs": [
       {
         "type": "ActionPointsCost",
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 13
+          "value": 8
         }
       }
     ],
@@ -90,14 +101,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        },
+        "FROZEN",
         "MECHANISM",
         {
           "type": 7,
@@ -107,10 +111,10 @@
     }
   },
   "m_displayName": "XELOR - Xelocube Lunaire",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 4961,
   "m_i18nDescriptionId": 53663,
   "m_elementaryStates": 1,
-  "assetGuid": "",
+  "assetGuid": "758209335cd8df843820ee4ea5a57ac4",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/737.json b/data/json/SpellDefinition/737.json
index 7ead5b60067984f83436e85002a867f756c4ddd8..9d19f65c0b62647556c9f8ceab15d152ba730828 100644
--- a/data/json/SpellDefinition/737.json
+++ b/data/json/SpellDefinition/737.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 737,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/738.json b/data/json/SpellDefinition/738.json
index 859c27c87d7e45bc49828962f4e428da7f35066e..984658239c293123d4590119e6458861e30ce7bc 100644
--- a/data/json/SpellDefinition/738.json
+++ b/data/json/SpellDefinition/738.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 738,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/739.json b/data/json/SpellDefinition/739.json
index 2efadc587d0b58f4c0fa74a79ef8b6c72914e8bc..d03dc6e4a5392c6c3e4b0b5e90d7735746d23642 100644
--- a/data/json/SpellDefinition/739.json
+++ b/data/json/SpellDefinition/739.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 739,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/74.json b/data/json/SpellDefinition/74.json
index 3d7076d77b80bf4423ca0fd2fc2bf109febfac9e..c9ef8073a7595fb44dbe60a13a6ec95ec4a9352a 100644
--- a/data/json/SpellDefinition/74.json
+++ b/data/json/SpellDefinition/74.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 74,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/740.json b/data/json/SpellDefinition/740.json
index 845a2b0fafb277669cb50202baf3bcceaa3750e1..cd9ba556722b7b459ff06a655e210f5b3364935c 100644
--- a/data/json/SpellDefinition/740.json
+++ b/data/json/SpellDefinition/740.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 740,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/741.json b/data/json/SpellDefinition/741.json
index 13cb5c0bba148cb67120711ba308f4601030d385..abbaf8ab36b01973c962075b9f44b78263fc09ff 100644
--- a/data/json/SpellDefinition/741.json
+++ b/data/json/SpellDefinition/741.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 741,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,22 +57,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 5.4,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 35
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/7410.json b/data/json/SpellDefinition/7410.json
index cb89adb8f8ed3b0e4cf2e68f29af94b7b6bf7aa2..b1ba1524dce530253306b1630b0ad729b94686d4 100644
--- a/data/json/SpellDefinition/7410.json
+++ b/data/json/SpellDefinition/7410.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 7410,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 5,
       "equipable": true,
       "families": [
-        8
+        8,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/74167.json b/data/json/SpellDefinition/74167.json
index f0d8fc71666a1c6e9429906a6ff32a285b370f3c..dc6d6e531f9eca7355d0ff17742cb972a24adab6 100644
--- a/data/json/SpellDefinition/74167.json
+++ b/data/json/SpellDefinition/74167.json
@@ -4,25 +4,36 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 74167,
+    "merchantCosts": [],
     "tags": [
       10
     ],
     "details": {
       "type": "SpellDetails",
-      "element": 4,
-      "equipable": true,
+      "element": 6,
+      "equipable": false,
       "families": [
         7
       ]
     },
-    "gaugeToModifyOnSpellPlay": [],
+    "gaugeToModifyOnSpellPlay": [
+      {
+        "type": "GaugeValue",
+        "element": 57,
+        "value": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1
+        }
+      }
+    ],
     "costs": [
       {
         "type": "ActionPointsCost",
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 13
+          "value": 8
         }
       }
     ],
@@ -100,10 +111,10 @@
     }
   },
   "m_displayName": "XELOR - Xelocube Volcanique",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 56684,
   "m_i18nDescriptionId": 88511,
   "m_elementaryStates": 1,
-  "assetGuid": "",
+  "assetGuid": "8baec6bcfff3b6449a7240346387d2a2",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/743.json b/data/json/SpellDefinition/743.json
index aeffd506a57385a8437636cd09094597afb6a5d3..3d100a0f1239c350453ee084ee560ab64f74a614 100644
--- a/data/json/SpellDefinition/743.json
+++ b/data/json/SpellDefinition/743.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 743,
+    "merchantCosts": [],
     "tags": [
       10
     ],
@@ -12,7 +13,8 @@
       "element": 1,
       "equipable": true,
       "families": [
-        7
+        7,
+        20
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/744.json b/data/json/SpellDefinition/744.json
index beaf2d5ffaa6dc53dcb71624fe492bfc28a4c2ec..e40d148ad45776b9a7779dfb48e41e9804ba7afb 100644
--- a/data/json/SpellDefinition/744.json
+++ b/data/json/SpellDefinition/744.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 744,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/745.json b/data/json/SpellDefinition/745.json
index c45601e9839d52e2f2098891fe96331557982616..7f1b723b260b852a638581c6ecd7ff802d8b2fd9 100644
--- a/data/json/SpellDefinition/745.json
+++ b/data/json/SpellDefinition/745.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 745,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/7451.json b/data/json/SpellDefinition/7451.json
index 67a69edbe2abef6f054b17c141b2b70bdefd5b21..c43d1d21fb574da8031d66bdf463948e0992d7c0 100644
--- a/data/json/SpellDefinition/7451.json
+++ b/data/json/SpellDefinition/7451.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 7451,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/746.json b/data/json/SpellDefinition/746.json
index 0d6f7ba738d29b53667a584aed1537b89c6a5901..ec4d3ec92f7c996abfd31afab142ea905ef718e1 100644
--- a/data/json/SpellDefinition/746.json
+++ b/data/json/SpellDefinition/746.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 746,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/747.json b/data/json/SpellDefinition/747.json
index fd475a706f1afb584e648e5564879e897b4b3623..6fd158722f15760c47857ef02c04ed48cb4799e9 100644
--- a/data/json/SpellDefinition/747.json
+++ b/data/json/SpellDefinition/747.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 747,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/748.json b/data/json/SpellDefinition/748.json
index 7cd6774b1a7d8f50a2b71a5694162371633021eb..d2a6eeeb7866df7ed4997aa8c8eb159cc6ccbd41 100644
--- a/data/json/SpellDefinition/748.json
+++ b/data/json/SpellDefinition/748.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 748,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/75.json b/data/json/SpellDefinition/75.json
index e2016cee29712ab538a8fe6415ce441e6813113d..db2b257ed3eff33611fbd99bce9c7a20c46ccac4 100644
--- a/data/json/SpellDefinition/75.json
+++ b/data/json/SpellDefinition/75.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 75,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/752.json b/data/json/SpellDefinition/752.json
index 3077e8db95b86936a186477e3a21862afab3aacc..0db49b8dbc401e6e608a523d80e7ef32a86aa56e 100644
--- a/data/json/SpellDefinition/752.json
+++ b/data/json/SpellDefinition/752.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 752,
+    "merchantCosts": [],
     "tags": [
       4
     ],
diff --git a/data/json/SpellDefinition/753.json b/data/json/SpellDefinition/753.json
index 0807375190dd78def413199d83fac8ddf5c1e1bb..1a5d9d03c80c3e9c4c45cd4c72bba92285c64eb9 100644
--- a/data/json/SpellDefinition/753.json
+++ b/data/json/SpellDefinition/753.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 753,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/755.json b/data/json/SpellDefinition/755.json
index a8a8dcb0f4a2251de7337c1c1208bb7d894b453e..b824675dc20e0b037cefb2af257a4a3416cd4e54 100644
--- a/data/json/SpellDefinition/755.json
+++ b/data/json/SpellDefinition/755.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 755,
+    "merchantCosts": [],
     "tags": [
       0
     ],
@@ -69,7 +70,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 6
+          "value": 20
         },
         {
           "type": "ConstIntegerValue",
diff --git a/data/json/SpellDefinition/756.json b/data/json/SpellDefinition/756.json
index e19592e1ca3479e73e52e62e921b9ac56317d6b4..f23c903bc593a6e2a52ed448b572bdd01da75fe2 100644
--- a/data/json/SpellDefinition/756.json
+++ b/data/json/SpellDefinition/756.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 756,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/757.json b/data/json/SpellDefinition/757.json
index 72a007eff4ff5032cd8e181bc6623d2fae1c5544..2502cc4b0ea23c8b2317f24d25825b720608dd01 100644
--- a/data/json/SpellDefinition/757.json
+++ b/data/json/SpellDefinition/757.json
@@ -4,13 +4,14 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 757,
+    "merchantCosts": [],
     "tags": [
       3
     ],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         2
       ]
diff --git a/data/json/SpellDefinition/758.json b/data/json/SpellDefinition/758.json
index eae29c9493b978ddd30621df6da7331fae82ac61..0e6d21e8ba5a8f59d56542659326b4bb9fe17b7d 100644
--- a/data/json/SpellDefinition/758.json
+++ b/data/json/SpellDefinition/758.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 758,
+    "merchantCosts": [],
     "tags": [
       0
     ],
@@ -78,11 +79,12 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 25
+          "value": 20
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "MELEE"
       ]
     }
diff --git a/data/json/SpellDefinition/759.json b/data/json/SpellDefinition/759.json
index 5bcbc4c8acb2e9f3d918770e90ddba3790a532c9..b9121da1de6dcd8d22bb6cb4a67517a0c768e91f 100644
--- a/data/json/SpellDefinition/759.json
+++ b/data/json/SpellDefinition/759.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 759,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/76.json b/data/json/SpellDefinition/76.json
index 43f2ddfacbc7ad56c8629fc04b6cd7ba5262482f..5042dee8f3884f1bae842d86093dff97919280fd 100644
--- a/data/json/SpellDefinition/76.json
+++ b/data/json/SpellDefinition/76.json
@@ -4,13 +4,14 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 76,
+    "merchantCosts": [],
     "tags": [
       10
     ],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         2
       ]
diff --git a/data/json/SpellDefinition/761.json b/data/json/SpellDefinition/761.json
index 9ee955c319336aff76fed2df8dd3cce5d49b14c7..bd9f6b20f52713bbb594da617e8a9c32e37a4fe7 100644
--- a/data/json/SpellDefinition/761.json
+++ b/data/json/SpellDefinition/761.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 761,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/762.json b/data/json/SpellDefinition/762.json
index bb9a1c051e7fd00dcbe95e5a746ffec9e50c0d27..cc85044e6ce086de3e7dc302436103242e7a75dd 100644
--- a/data/json/SpellDefinition/762.json
+++ b/data/json/SpellDefinition/762.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 762,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/763.json b/data/json/SpellDefinition/763.json
index 187ae8f495f82f5911ac5c3dc25ddb4dc425a40f..d60bbfa305cbc30631811245474fcad55b603162 100644
--- a/data/json/SpellDefinition/763.json
+++ b/data/json/SpellDefinition/763.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 763,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/764.json b/data/json/SpellDefinition/764.json
index 938cb763c1facb1d61afcb9ddad4fccd0d693952..71814855eba327394af63e7c49a820cd357d5c2c 100644
--- a/data/json/SpellDefinition/764.json
+++ b/data/json/SpellDefinition/764.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 764,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        8
+        8,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/765.json b/data/json/SpellDefinition/765.json
index 9b1fc85bcb1bbcf73dc34faffa6de91355e13f2e..9a3fcd3b17987260ce5424ab409cce98aa9aef66 100644
--- a/data/json/SpellDefinition/765.json
+++ b/data/json/SpellDefinition/765.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 765,
+    "merchantCosts": [],
     "tags": [
       0
     ],
diff --git a/data/json/SpellDefinition/766.json b/data/json/SpellDefinition/766.json
index f29e9dd3ba2ec7ee29cda584f2274fd087245521..40e8468038748f960ece2eece6b77ac6a3c045da 100644
--- a/data/json/SpellDefinition/766.json
+++ b/data/json/SpellDefinition/766.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 766,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,22 +44,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "min",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "max",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 20
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/767.json b/data/json/SpellDefinition/767.json
index f03da325b914cfe7bf761d9c57c0315a7ae3d3b4..5eaba8dfc8ebad0c57c76a571886f60666e980ab 100644
--- a/data/json/SpellDefinition/767.json
+++ b/data/json/SpellDefinition/767.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 767,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -78,12 +79,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "at",
           "baseValue": 8.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/769.json b/data/json/SpellDefinition/769.json
index 6693226efe7a27307cab5306ee728d55e5092b8a..7dd4e7bf4d111ea903fc581ff79543a6a3387474 100644
--- a/data/json/SpellDefinition/769.json
+++ b/data/json/SpellDefinition/769.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 769,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/77.json b/data/json/SpellDefinition/77.json
index 882e61286e0a9c921371e92bf3ced2ef91c84449..f3040b39424d9ee27b155ccf12bef94e1d0c4c09 100644
--- a/data/json/SpellDefinition/77.json
+++ b/data/json/SpellDefinition/77.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 77,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "armin",
           "baseValue": 9.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "armax",
           "baseValue": 11.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/772.json b/data/json/SpellDefinition/772.json
index 60bac1e822679756ff6c7b7edc670b88a11697d3..fc6a8483bd41256796b914150af549f3a93edde6 100644
--- a/data/json/SpellDefinition/772.json
+++ b/data/json/SpellDefinition/772.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 772,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/773.json b/data/json/SpellDefinition/773.json
index be6178316df5cda5b606bb86a5781cf7bfe09742..b1437c022211f68aa33221ce02cecfb2f1b0e123 100644
--- a/data/json/SpellDefinition/773.json
+++ b/data/json/SpellDefinition/773.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 773,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
       "equipable": true,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/774.json b/data/json/SpellDefinition/774.json
index 77cb42ad1066c087fba934bd6411838e7562d815..08df8f9d16802fc4e9c058399f3a2957b95a2873 100644
--- a/data/json/SpellDefinition/774.json
+++ b/data/json/SpellDefinition/774.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 774,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -65,21 +66,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 13.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/775.json b/data/json/SpellDefinition/775.json
index 303583a27217a295e6404cde3a440701bb1426a7..b6465caaa988edc5bfbf7e65c7419577809c6d7b 100644
--- a/data/json/SpellDefinition/775.json
+++ b/data/json/SpellDefinition/775.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 775,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 15.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/776.json b/data/json/SpellDefinition/776.json
index b9015ef8ac49ee6cf3d6a0b3dba022b8d33e74e8..08ce34e7720a1b6ae163a593afe64bbbbaec6522 100644
--- a/data/json/SpellDefinition/776.json
+++ b/data/json/SpellDefinition/776.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 776,
+    "merchantCosts": [],
     "tags": [
       10
     ],
@@ -91,7 +92,6 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
         "CHIBIDIAL",
         "MECHANISM",
         {
diff --git a/data/json/SpellDefinition/778.json b/data/json/SpellDefinition/778.json
index 86184ebbbf0c954f4404388079b17392f2060c15..4c420fef87803e04380442f58ce12e9b5d8d3478 100644
--- a/data/json/SpellDefinition/778.json
+++ b/data/json/SpellDefinition/778.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 778,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/779.json b/data/json/SpellDefinition/779.json
index fa51cea0b6aaedf4f9246dafceddf0c01ed41d0b..9b8ea087b4de0b57cc39ab5de0036d69737319d7 100644
--- a/data/json/SpellDefinition/779.json
+++ b/data/json/SpellDefinition/779.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 779,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/78.json b/data/json/SpellDefinition/78.json
index ffac846b5a44ae3e46f790176d698dfc7b6bcac3..5622b7739a17a93334d51d55346bbcdfea41d322 100644
--- a/data/json/SpellDefinition/78.json
+++ b/data/json/SpellDefinition/78.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 78,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/780.json b/data/json/SpellDefinition/780.json
index 0c199072988673b9c57f2bc4c85ac4cdcc39dd19..0729b02895f429175f9901893d6612fe8b4856a0 100644
--- a/data/json/SpellDefinition/780.json
+++ b/data/json/SpellDefinition/780.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 780,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/782.json b/data/json/SpellDefinition/782.json
index 832b0325ac7d424a4e33aee58ec373de958d0280..03e32704a73ca22a5d01e87ecf1091c39381fa30 100644
--- a/data/json/SpellDefinition/782.json
+++ b/data/json/SpellDefinition/782.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 782,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 10000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/784.json b/data/json/SpellDefinition/784.json
index 22c11a3bcc22d76cf9be4d63879c5f7a155f215d..e8ff9a9d64ab2a3d579f17235e2f0da78db39fea 100644
--- a/data/json/SpellDefinition/784.json
+++ b/data/json/SpellDefinition/784.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 784,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/786.json b/data/json/SpellDefinition/786.json
index 8d5b4b372c59857b3592fbd6046aa6da495fb504..cd259e21be76c6c75e44e2cbff3247dc24528cac 100644
--- a/data/json/SpellDefinition/786.json
+++ b/data/json/SpellDefinition/786.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 786,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/788.json b/data/json/SpellDefinition/788.json
index 7ec85238b0319a048a87ed25ccaf5ab63eadf23e..95dffe848185ce57081a54185008709a03b93f2b 100644
--- a/data/json/SpellDefinition/788.json
+++ b/data/json/SpellDefinition/788.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 788,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/79.json b/data/json/SpellDefinition/79.json
index 95cc0e24510b7862002ee3878996ec889a236905..b5e65c72c4454f560d42cc29858ff042f7b91b1c 100644
--- a/data/json/SpellDefinition/79.json
+++ b/data/json/SpellDefinition/79.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 79,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/790.json b/data/json/SpellDefinition/790.json
index 7eedf3ea060ba43c10cd1479bd29331d5a39ca13..273453b34de32ea9f643d1d98862c9165e0dd40d 100644
--- a/data/json/SpellDefinition/790.json
+++ b/data/json/SpellDefinition/790.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 790,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/791.json b/data/json/SpellDefinition/791.json
index 9bef1d37bdd49e12fc0a18544ad7f66ce364d95b..42d500153dcb906e1fb5147e4a733fd0c8e37305 100644
--- a/data/json/SpellDefinition/791.json
+++ b/data/json/SpellDefinition/791.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 791,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 21.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/792.json b/data/json/SpellDefinition/792.json
index 1d7ad946fc64d85cd12d646fea86b47c5274070a..7eecb628a10c797701d6a6edb6809ca065206f47 100644
--- a/data/json/SpellDefinition/792.json
+++ b/data/json/SpellDefinition/792.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 792,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,21 +54,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 22.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 27.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/793.json b/data/json/SpellDefinition/793.json
index 5d6ea3ab1db278851e90689469f981df558f4437..45079ffd79e29881e450ff1c4fffa5e6eab582d6 100644
--- a/data/json/SpellDefinition/793.json
+++ b/data/json/SpellDefinition/793.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 793,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/794.json b/data/json/SpellDefinition/794.json
index 6866efb56d9f806c4a8dcecf4e9d977abc25a639..783f25a12e4316da72c159b9f8ddd6fd2d2d9879 100644
--- a/data/json/SpellDefinition/794.json
+++ b/data/json/SpellDefinition/794.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 794,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/795.json b/data/json/SpellDefinition/795.json
index 2ad88db64f58962bf96ff132f8bb5ae879d6cb31..efc37887614f7c51f32e49a15a31e976e45e1e2e 100644
--- a/data/json/SpellDefinition/795.json
+++ b/data/json/SpellDefinition/795.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 795,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/798.json b/data/json/SpellDefinition/798.json
index 1404ff4a96fdeb516c849d32fd3075f5f29ff8b1..53a78027bb235997b29e4d38f2279e0c1fa845a6 100644
--- a/data/json/SpellDefinition/798.json
+++ b/data/json/SpellDefinition/798.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 798,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 20.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/799.json b/data/json/SpellDefinition/799.json
index e14b0f31de53287b69b2eca85144b0eab9fb8e0e..d8c1e79b662adb2e60a3a450a3e0488c3ed818d4 100644
--- a/data/json/SpellDefinition/799.json
+++ b/data/json/SpellDefinition/799.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 799,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/8.json b/data/json/SpellDefinition/8.json
index 51d76c8ce313e6c6b020872c4cee23a35f4547c7..0c6524bd5f64e1485ae3bfc0373c6516f2c686cb 100644
--- a/data/json/SpellDefinition/8.json
+++ b/data/json/SpellDefinition/8.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 8,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/80.json b/data/json/SpellDefinition/80.json
index 9e01c8eb1f55617ae5f6a4e59110251b2f84b13c..b06729635053f68f4bc23fd852fe5b0ac91146fd 100644
--- a/data/json/SpellDefinition/80.json
+++ b/data/json/SpellDefinition/80.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 80,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,21 +55,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 22.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 27.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/802.json b/data/json/SpellDefinition/802.json
index 3dcc1a4622cbabf4dca74e03b7063cf810e24d13..710948153334f0c1dbc92a6124125e05433ddcaf 100644
--- a/data/json/SpellDefinition/802.json
+++ b/data/json/SpellDefinition/802.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 802,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": false,
       "families": [
-        67
+        67,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/804.json b/data/json/SpellDefinition/804.json
index 8df57af7f394448504cedd347e575e884fd0b9f0..6d3fb16b070aaf6889e82ebcafe7820f9ebf2637 100644
--- a/data/json/SpellDefinition/804.json
+++ b/data/json/SpellDefinition/804.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 804,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 13.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/806.json b/data/json/SpellDefinition/806.json
index 77bbd6c05e32557ebbcb2d7b96d1a5deb3db8eaa..33d85187116e5548f7fbb7e40634967c260c47f1 100644
--- a/data/json/SpellDefinition/806.json
+++ b/data/json/SpellDefinition/806.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 806,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -65,7 +66,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 21
+          "value": 27
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/807.json b/data/json/SpellDefinition/807.json
index 477c658fed3d931fe79ad4854eaa5a85b723d8b5..af0838456e5ab4d7defdccc9693a3fddb5094044 100644
--- a/data/json/SpellDefinition/807.json
+++ b/data/json/SpellDefinition/807.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 807,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 23.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/808.json b/data/json/SpellDefinition/808.json
index b23c4072136edc20d2ecb4b333d142535eae07d4..eb1b4949b8be05269fe9eb07f8f9e5c8629369cf 100644
--- a/data/json/SpellDefinition/808.json
+++ b/data/json/SpellDefinition/808.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 808,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/8095.json b/data/json/SpellDefinition/8095.json
index 2fe6493d25589cc7abf582a8725b4ac9029e8bbf..d8925150847cc26dc3bc5f4f9e2674fc8e27460e 100644
--- a/data/json/SpellDefinition/8095.json
+++ b/data/json/SpellDefinition/8095.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 8095,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/810.json b/data/json/SpellDefinition/810.json
index 78a6e9713900c9f585201e2e384a21c21d2a16b4..4885f726b1b1147bfe25f5f11d3b32776ecbd046 100644
--- a/data/json/SpellDefinition/810.json
+++ b/data/json/SpellDefinition/810.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 810,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/811.json b/data/json/SpellDefinition/811.json
index f6845f454c3e7e101ae17ca3790beb194a7aa275..afd1832dca76c08f49f711338784cbb7cf5d67e1 100644
--- a/data/json/SpellDefinition/811.json
+++ b/data/json/SpellDefinition/811.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 811,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         7
       ]
diff --git a/data/json/SpellDefinition/812.json b/data/json/SpellDefinition/812.json
index d348e5a8f560b85f68eb21e4a5d3b8c29e546b48..9b5f837d1a4d0a37567c85b909f5b55078ab003b 100644
--- a/data/json/SpellDefinition/812.json
+++ b/data/json/SpellDefinition/812.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 812,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,7 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "CasterHeroSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "CasterHeroSelector"
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/813.json b/data/json/SpellDefinition/813.json
index 12df4fd3c918222dcecd65fe06604afac1caed35..29b14c6c54c769b59c6d8a1bc0d93abce27e0d7b 100644
--- a/data/json/SpellDefinition/813.json
+++ b/data/json/SpellDefinition/813.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 813,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -53,12 +54,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 16.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/814.json b/data/json/SpellDefinition/814.json
index 27154b070f9d967b0b82146ec2db3b5b1b70f7a4..1746716970d7730b9657b7b867b25ecb377840ef 100644
--- a/data/json/SpellDefinition/814.json
+++ b/data/json/SpellDefinition/814.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 814,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/816.json b/data/json/SpellDefinition/816.json
index c81d8d4cd4c15036720644dbc35581da625fc736..88a0a1a5f9de0257466d6a22ec3752fb9c5acb98 100644
--- a/data/json/SpellDefinition/816.json
+++ b/data/json/SpellDefinition/816.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 816,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -36,7 +43,15 @@
       "type": "OneCastTargetDefinition",
       "selector": {
         "type": "FilteredCharacterSelector",
-        "filters": []
+        "filters": [
+          {
+            "type": "TeamFilter",
+            "isIdentical": true,
+            "reference": {
+              "type": "CasterSelector"
+            }
+          }
+        ]
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/818.json b/data/json/SpellDefinition/818.json
index 75d853905e2fa3918faac2bdc9782171b35ccea7..d9c6ccfd551511431d041e36957d6812e421dcd4 100644
--- a/data/json/SpellDefinition/818.json
+++ b/data/json/SpellDefinition/818.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 818,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/819.json b/data/json/SpellDefinition/819.json
index 98daa934237c7ab2475b1144e374b83c6454c530..5dfffb081d692df68df1afd72dca6e5d9c983632 100644
--- a/data/json/SpellDefinition/819.json
+++ b/data/json/SpellDefinition/819.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 819,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -77,7 +78,6 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
         "CHIBIDIAL"
       ]
     }
diff --git a/data/json/SpellDefinition/82.json b/data/json/SpellDefinition/82.json
index 060679196324dabf3e4f001802f095b0991dda48..40e7b34e152d3c62234d44399413341827a3e088 100644
--- a/data/json/SpellDefinition/82.json
+++ b/data/json/SpellDefinition/82.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 82,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/820.json b/data/json/SpellDefinition/820.json
index 8f89cbdbf093782b7843a60e3491b596863cd584..6a7436ab79d7d7ce85877bdc5b03e57131e95210 100644
--- a/data/json/SpellDefinition/820.json
+++ b/data/json/SpellDefinition/820.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 820,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/821.json b/data/json/SpellDefinition/821.json
index ff32b5c61e4d434841c092a2b4e7aac271e0eabf..b52b2aaca11ed52772bd538ee4226523cb469748 100644
--- a/data/json/SpellDefinition/821.json
+++ b/data/json/SpellDefinition/821.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 821,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/822.json b/data/json/SpellDefinition/822.json
index e2624b6904762057f8d575fe8d74fb6b3d4a2ad2..566fd474622fb5dcac42547f269896705cedf520 100644
--- a/data/json/SpellDefinition/822.json
+++ b/data/json/SpellDefinition/822.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 822,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -54,21 +55,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 23.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/823.json b/data/json/SpellDefinition/823.json
index d2c5cacdb1b4b4e06fbd91c1a84f38a51d62f0b6..8aabefc1c586f3a3927669a3226ad8addb3eb1b0 100644
--- a/data/json/SpellDefinition/823.json
+++ b/data/json/SpellDefinition/823.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 823,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 23.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 28.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/824.json b/data/json/SpellDefinition/824.json
index 6d6399bd688302cf1c8f8428912e97e888e96c0c..1937013b8379b4a81ab235ebd1a41d68405c8434 100644
--- a/data/json/SpellDefinition/824.json
+++ b/data/json/SpellDefinition/824.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 824,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/825.json b/data/json/SpellDefinition/825.json
index fc5ac4a3154e3d0c67e5a2c1e765e713dbbba8fa..3d21f33ed211eda6a023a5e8c86db71d30f1d5c0 100644
--- a/data/json/SpellDefinition/825.json
+++ b/data/json/SpellDefinition/825.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 825,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/826.json b/data/json/SpellDefinition/826.json
index c0bd8b6055a290422b70c0847937f2e4eb1a1b06..e3351d5d727d906f8eca39fdc09bb800fc50a35a 100644
--- a/data/json/SpellDefinition/826.json
+++ b/data/json/SpellDefinition/826.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 826,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/827.json b/data/json/SpellDefinition/827.json
index b1b36d9b3481ba83564702a53bf407d8f16417f5..e8acc168418739b49927cf960b3f09e51273d383 100644
--- a/data/json/SpellDefinition/827.json
+++ b/data/json/SpellDefinition/827.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 827,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/828.json b/data/json/SpellDefinition/828.json
index 4726c67449ff64f4e4d8e50fbf4eb3a52223f896..11385c7e545a952ff65d10bcd4b959a3b0f079b0 100644
--- a/data/json/SpellDefinition/828.json
+++ b/data/json/SpellDefinition/828.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 828,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
-        2
+        2,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/829.json b/data/json/SpellDefinition/829.json
index c6fcdb479cc1846fd1b842bb84807dc1adf246c1..caa681154505e09e07b705d27876c8c28253eb97 100644
--- a/data/json/SpellDefinition/829.json
+++ b/data/json/SpellDefinition/829.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 829,
+    "merchantCosts": [],
     "tags": [
       1
     ],
diff --git a/data/json/SpellDefinition/830.json b/data/json/SpellDefinition/830.json
index b2a7dffb7ce7b52adeacac31ed5bae1cb63d8d79..307a185dc7e4c0b6266610473a39a8a9d708648f 100644
--- a/data/json/SpellDefinition/830.json
+++ b/data/json/SpellDefinition/830.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 830,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/831.json b/data/json/SpellDefinition/831.json
index ff5b058675a6fda9696d32e6f73dc4e538ca0765..05e595d34bcef333aaca71a80f7d9f757b8ef1d4 100644
--- a/data/json/SpellDefinition/831.json
+++ b/data/json/SpellDefinition/831.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 831,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         7
       ]
diff --git a/data/json/SpellDefinition/832.json b/data/json/SpellDefinition/832.json
index 31d209ad5544e39df724503233d2ebd6bdfd3ca7..c09fc2ff8d87a9fb36a0f2ec4bb65316aaa4f793 100644
--- a/data/json/SpellDefinition/832.json
+++ b/data/json/SpellDefinition/832.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 832,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/8323.json b/data/json/SpellDefinition/8323.json
index 61664f06b7eaebc6c39f1d8491191f0bfcb99692..0a07f222e6c1b99c088480140ad44522f2a4cd5e 100644
--- a/data/json/SpellDefinition/8323.json
+++ b/data/json/SpellDefinition/8323.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 8323,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/833.json b/data/json/SpellDefinition/833.json
index c6093bcfd99594bb10657c5b1a4771f1cf3a7f51..12a727b55de97fd246c0aebd75c802eca8402679 100644
--- a/data/json/SpellDefinition/833.json
+++ b/data/json/SpellDefinition/833.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 833,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -49,6 +50,7 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "FLOOR",
         {
           "type": 6,
diff --git a/data/json/SpellDefinition/834.json b/data/json/SpellDefinition/834.json
index 200dc2579ca6801d8cdf9882c53d563b301e5c1c..4cc09ec8a629599e5ee452edc3ac8e4a2f9db966 100644
--- a/data/json/SpellDefinition/834.json
+++ b/data/json/SpellDefinition/834.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 834,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/835.json b/data/json/SpellDefinition/835.json
index 0494d237798d69e03e3c4d8c3a38919b58620843..ac9aea37405ebaaa02a1cd4fac55db7de5151117 100644
--- a/data/json/SpellDefinition/835.json
+++ b/data/json/SpellDefinition/835.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 835,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -108,13 +109,9 @@
           "value": 3
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/836.json b/data/json/SpellDefinition/836.json
index 7cc6f049982d63887d4c8f2a19abfd7f3f9400a4..533cf02e52331c3a786d56ca34898050e0842ee5 100644
--- a/data/json/SpellDefinition/836.json
+++ b/data/json/SpellDefinition/836.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 836,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 13.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/837.json b/data/json/SpellDefinition/837.json
index cedd4a1d42b8b2cdead728bcc7373c047ddcb77c..71836be3ee699332ecc42bc67dfcef159fbd1fe4 100644
--- a/data/json/SpellDefinition/837.json
+++ b/data/json/SpellDefinition/837.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 837,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/838.json b/data/json/SpellDefinition/838.json
index ddc256b25816f0fc657c5f9566afe5875043c095..d62036632774a9dd3f2e47462824153bc0a2e168 100644
--- a/data/json/SpellDefinition/838.json
+++ b/data/json/SpellDefinition/838.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 838,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/839.json b/data/json/SpellDefinition/839.json
index 4218b365aaea4001602b5d2c36a32c42adc0c450..46eab2b3b57322d9264078198322aeb7a5bbb954 100644
--- a/data/json/SpellDefinition/839.json
+++ b/data/json/SpellDefinition/839.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 839,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/84.json b/data/json/SpellDefinition/84.json
index 6376ba3b56cae3c31f21b74112d801575ed204b3..9e7818cdc3eac122a55f213c34992c0db58e91b9 100644
--- a/data/json/SpellDefinition/84.json
+++ b/data/json/SpellDefinition/84.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 84,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/840.json b/data/json/SpellDefinition/840.json
index 1fbd28c1cb3141a2a48129bc463ad398d0fc045b..f65697eefdb3d2f31430ed15e503e97ab4e7a829 100644
--- a/data/json/SpellDefinition/840.json
+++ b/data/json/SpellDefinition/840.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 840,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/841.json b/data/json/SpellDefinition/841.json
index 97ceab3e3c9bc5cdc1502f61b890acb26e252228..4f04cf533e6c78d34bcce663f208680d2ba4b5f5 100644
--- a/data/json/SpellDefinition/841.json
+++ b/data/json/SpellDefinition/841.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 841,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/843.json b/data/json/SpellDefinition/843.json
index 0716ddf7696ccc3034b05ed217a2dad3474d34f3..96de41c1d3faeddecb28732e70be9cd45c7c8640 100644
--- a/data/json/SpellDefinition/843.json
+++ b/data/json/SpellDefinition/843.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 843,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -81,21 +82,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 19.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/844.json b/data/json/SpellDefinition/844.json
index bd7e8ee3bfb172e14bb2e9b219cc1f9efc088569..4e54297ec56b332a1a4a43a6893f09d9f07d5e3d 100644
--- a/data/json/SpellDefinition/844.json
+++ b/data/json/SpellDefinition/844.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 844,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/847.json b/data/json/SpellDefinition/847.json
index 044f6fa172c50424d50d3e21aff974ceef5ff7f2..da407de627d43e5dbbd24ddd0413f145a8af53d9 100644
--- a/data/json/SpellDefinition/847.json
+++ b/data/json/SpellDefinition/847.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 847,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/849.json b/data/json/SpellDefinition/849.json
index 4c719c1327d9d609862c22cf932a3f9a5118c634..1e1eafec07fe2ea57c4c2928021e46b794e8b3dc 100644
--- a/data/json/SpellDefinition/849.json
+++ b/data/json/SpellDefinition/849.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 849,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/85.json b/data/json/SpellDefinition/85.json
index 49381d0ae4d8bb34fae4c4a579539dd87b12e24e..a267e9f34d8619cd84ce9d4fc49830d39d70fd20 100644
--- a/data/json/SpellDefinition/85.json
+++ b/data/json/SpellDefinition/85.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 85,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/850.json b/data/json/SpellDefinition/850.json
index 68dfd10faa1793a37e4e0d8d564da775b5df01e3..b29ca87669540c310245c2237c921bf07722ddea 100644
--- a/data/json/SpellDefinition/850.json
+++ b/data/json/SpellDefinition/850.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 850,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/851.json b/data/json/SpellDefinition/851.json
index 3e5fefc2518737d43aa4538d290c1d8fe8088bda..1051233c3b51d680e56b8bcb2e0e90de066abbd7 100644
--- a/data/json/SpellDefinition/851.json
+++ b/data/json/SpellDefinition/851.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 851,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/852.json b/data/json/SpellDefinition/852.json
index 1d8b79787e705112f69570ca0c5df055afa0a2e1..80529faf9f39d4f66ed5802a2bee83cdde285f69 100644
--- a/data/json/SpellDefinition/852.json
+++ b/data/json/SpellDefinition/852.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 852,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/853.json b/data/json/SpellDefinition/853.json
index 150c7e0de86f692986f3761ddf08b9359022a89e..28e2da554dac8e11ae2c9b69632d0c7c65bada24 100644
--- a/data/json/SpellDefinition/853.json
+++ b/data/json/SpellDefinition/853.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 853,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/854.json b/data/json/SpellDefinition/854.json
index 3b7fed4053764787468cf4af9555b15206cf39dd..14b612956ed77768641de123fc6d05ae3809c0b9 100644
--- a/data/json/SpellDefinition/854.json
+++ b/data/json/SpellDefinition/854.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 854,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/856.json b/data/json/SpellDefinition/856.json
index c6899d43ae32bf657f3d0c2f9dc0b978c1203405..10a58bca1eeca78e5fd357688b3238628ca8ee03 100644
--- a/data/json/SpellDefinition/856.json
+++ b/data/json/SpellDefinition/856.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 856,
+    "merchantCosts": [],
     "tags": [
       0
     ],
diff --git a/data/json/SpellDefinition/858.json b/data/json/SpellDefinition/858.json
index 6fbfc606208a1b73587f1fdecb03f25717416f8d..49504b4e6dc7a8a32c49562fbf524cb33f8a108e 100644
--- a/data/json/SpellDefinition/858.json
+++ b/data/json/SpellDefinition/858.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 858,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/86.json b/data/json/SpellDefinition/86.json
index a28e487b3875b096fe42bf75789d6a18c5d8d60f..110275fe47e06e8b74e91188e651b5fb4df2d010 100644
--- a/data/json/SpellDefinition/86.json
+++ b/data/json/SpellDefinition/86.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 86,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/860.json b/data/json/SpellDefinition/860.json
index c10889af6d308bbab5b8335146284c1bbc261b5b..b05f6523467253dc7440b917c01872fcf58ff448 100644
--- a/data/json/SpellDefinition/860.json
+++ b/data/json/SpellDefinition/860.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 860,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/861.json b/data/json/SpellDefinition/861.json
index cd719964ba612d70b5b949f428f4a793dccf0326..7aa86cf72ee8e76de0cdb6560aef5bebbbc78d00 100644
--- a/data/json/SpellDefinition/861.json
+++ b/data/json/SpellDefinition/861.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 861,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/862.json b/data/json/SpellDefinition/862.json
index ac17a0086b3b09ae458d970fc5863946f4824e02..5637500477958b4d0be226cf8c7792667c09f30a 100644
--- a/data/json/SpellDefinition/862.json
+++ b/data/json/SpellDefinition/862.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 862,
+    "merchantCosts": [],
     "tags": [
       1
     ],
@@ -43,48 +44,23 @@
         "filters": []
       },
       "selector2": {
-        "type": "UnionOfCoordsSelector",
-        "first": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 0
-                }
-              }
-            }
-          ]
-        },
-        "second": {
-          "type": "FilteredCoordSelector",
-          "filters": [
-            {
-              "type": "AroundTargetFilter",
-              "targetsToCompare": {
-                "type": "FirstCastTargetSelector"
-              },
-              "distance": {
-                "type": "EqualsTo",
-                "dynamicValue": {
-                  "type": "ConstIntegerValue",
-                  "referenceId": "",
-                  "value": 1
-                }
-              }
+        "type": "FilteredCoordSelector",
+        "filters": [
+          {
+            "type": "AroundTargetFilter",
+            "targetsToCompare": {
+              "type": "FirstCastTargetSelector"
             },
-            {
-              "type": "CellValidForCharacterFilter"
+            "distance": {
+              "type": "EqualsTo",
+              "dynamicValue": {
+                "type": "ConstIntegerValue",
+                "referenceId": "",
+                "value": 1
+              }
             }
-          ]
-        }
+          }
+        ]
       }
     },
     "spellEffectData": [
@@ -116,7 +92,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "dmg",
-          "value": 23
+          "value": 22
         },
         {
           "type": "ConstIntegerValue",
@@ -126,7 +102,8 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "REWIND"
+        "REWIND",
+        "PUSH"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/863.json b/data/json/SpellDefinition/863.json
index e4923fd167b76dcd99cf5945544583ecbe07024c..cd194dd393dcd4cba273756867d34e08e335b47e 100644
--- a/data/json/SpellDefinition/863.json
+++ b/data/json/SpellDefinition/863.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 863,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/864.json b/data/json/SpellDefinition/864.json
index 6ab54986e11b60cd8c1f524ad2e2d3481a3f2a77..22fb7813a40210b96057d0bc4ee3941eb105516f 100644
--- a/data/json/SpellDefinition/864.json
+++ b/data/json/SpellDefinition/864.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 864,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -57,21 +58,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 10.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 13.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/868.json b/data/json/SpellDefinition/868.json
index 210d8ccfa4d5a425f5c8ec51b9d265eb93863f0a..6eb8c07880ecf8f724110500f63d56da0627560a 100644
--- a/data/json/SpellDefinition/868.json
+++ b/data/json/SpellDefinition/868.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 868,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 2500
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 3,
-      "equipable": false,
+      "equipable": true,
       "families": [
         68
       ]
diff --git a/data/json/SpellDefinition/869.json b/data/json/SpellDefinition/869.json
index 4fd91bf1bb5d10e4ed8591eb8b64b8b8aeb7b269..6edf8c5910c0ca79e3735dc407bb2732500dc657 100644
--- a/data/json/SpellDefinition/869.json
+++ b/data/json/SpellDefinition/869.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 869,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/87.json b/data/json/SpellDefinition/87.json
index 62710ac8fa1f83e8256539bd830c805e6b450ada..c816e712010ce0d4d5aed20fd17ce8344a4e7a2c 100644
--- a/data/json/SpellDefinition/87.json
+++ b/data/json/SpellDefinition/87.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 87,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -63,21 +64,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 16.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/871.json b/data/json/SpellDefinition/871.json
index 149c526df2d50b271af96fcd33866a034261fc0a..23689b55c06606a6b708dc8c1c1e9dd9c8ccd190 100644
--- a/data/json/SpellDefinition/871.json
+++ b/data/json/SpellDefinition/871.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 871,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/872.json b/data/json/SpellDefinition/872.json
index eb002b610a9b07840d7557aeb3f90ce6d7f99221..ccdb72b401774da6e9dea3e84b3fc94c7d74b9a3 100644
--- a/data/json/SpellDefinition/872.json
+++ b/data/json/SpellDefinition/872.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 872,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/873.json b/data/json/SpellDefinition/873.json
index cc309acc85fda1252134430dcf8b747332d2ca8b..7012224910e9376a2e18c96a6165528d90293a4c 100644
--- a/data/json/SpellDefinition/873.json
+++ b/data/json/SpellDefinition/873.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 873,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/874.json b/data/json/SpellDefinition/874.json
index 95fcd20c2807214db0ea9759625ff6ace32f1365..7d34503195566019100743bbd1559a6c8bfc5136 100644
--- a/data/json/SpellDefinition/874.json
+++ b/data/json/SpellDefinition/874.json
@@ -4,12 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 874,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
       "equipable": false,
-      "families": []
+      "families": [
+        74
+      ]
     },
     "gaugeToModifyOnSpellPlay": [
       {
diff --git a/data/json/SpellDefinition/875.json b/data/json/SpellDefinition/875.json
index b5194dc8ea93867fdadcbe000b14b03bc61146fc..f46447257c54366fdfd5e922edf508413d7e7a62 100644
--- a/data/json/SpellDefinition/875.json
+++ b/data/json/SpellDefinition/875.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 875,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/8755.json b/data/json/SpellDefinition/8755.json
index a91d5bd0bc805859e7ebec628a072a7654b45b66..5908a1c7884432b553fb2d167803c499551ca187 100644
--- a/data/json/SpellDefinition/8755.json
+++ b/data/json/SpellDefinition/8755.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 8755,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/876.json b/data/json/SpellDefinition/876.json
index ef4b81e793a57504a89981013542ad0d36e96257..d9b9d4958f33f7729f8fd2eaa23c0c4b1bf4d9b1 100644
--- a/data/json/SpellDefinition/876.json
+++ b/data/json/SpellDefinition/876.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 876,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -67,30 +68,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 8.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.2,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/877.json b/data/json/SpellDefinition/877.json
index eb9acfa08e71fde9e9b72f50b6ca3fc890bf4368..f29382a22ab84f7153194183e569cb5526085858 100644
--- a/data/json/SpellDefinition/877.json
+++ b/data/json/SpellDefinition/877.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 877,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/88.json b/data/json/SpellDefinition/88.json
index e32601602f236c552755f2802b045c75d737c4ec..3b0d81cc83353ca6d611b1ee81288c518771b34d 100644
--- a/data/json/SpellDefinition/88.json
+++ b/data/json/SpellDefinition/88.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 88,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/883.json b/data/json/SpellDefinition/883.json
index 66af54d84ef7f8ac3d9f3c16db0ab4ab5a39a523..e9b4c80163648e0dec96b3a51a76c6df0326117d 100644
--- a/data/json/SpellDefinition/883.json
+++ b/data/json/SpellDefinition/883.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 883,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/884.json b/data/json/SpellDefinition/884.json
index 4c8d150f4e5c1a293726863506911fb7f8183bd4..3b49413a40737257133ef015aa90907d14b4565d 100644
--- a/data/json/SpellDefinition/884.json
+++ b/data/json/SpellDefinition/884.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 884,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/8847.json b/data/json/SpellDefinition/8847.json
index cc3668ecb5155a505308f6d82e875ee217ea0e00..bd684115fe27b13e460d9901a4f1b21837245d86 100644
--- a/data/json/SpellDefinition/8847.json
+++ b/data/json/SpellDefinition/8847.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 8847,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -72,30 +73,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 22.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/885.json b/data/json/SpellDefinition/885.json
index ee829e215b459c850212fd0eb2c686eccc726d8a..6229fba3c5491e1488e6bcda09263052f5b1bded 100644
--- a/data/json/SpellDefinition/885.json
+++ b/data/json/SpellDefinition/885.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 885,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/886.json b/data/json/SpellDefinition/886.json
index 66bd25185a42262aab66bfb18feaac3863aeb9e7..df1d5fa10fc9862e27e90a0361bf8fa99a26ffab 100644
--- a/data/json/SpellDefinition/886.json
+++ b/data/json/SpellDefinition/886.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 886,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/887.json b/data/json/SpellDefinition/887.json
index c94796fadeb23371e90260b2b4420244fa1e1b4a..10227f045fa2988bf10f20873713330a48e927a1 100644
--- a/data/json/SpellDefinition/887.json
+++ b/data/json/SpellDefinition/887.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 887,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/889.json b/data/json/SpellDefinition/889.json
index 935fd404e6e708b69496f026973693d053907fa5..2ae13d2db2d7b6bc2d8faa35639df57f7e554802 100644
--- a/data/json/SpellDefinition/889.json
+++ b/data/json/SpellDefinition/889.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 889,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/890.json b/data/json/SpellDefinition/890.json
index a36cfbc26da83e563119292c0bc039ec42fe16f3..7f89532c55bb0af14507b14ea4486c5febf7b2d3 100644
--- a/data/json/SpellDefinition/890.json
+++ b/data/json/SpellDefinition/890.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 890,
+    "merchantCosts": [],
     "tags": [
       10
     ],
diff --git a/data/json/SpellDefinition/891.json b/data/json/SpellDefinition/891.json
index 45e9a5328f8acab154b1fe5b59765bdf08adf8b7..8e48fe138cf4d2cb81c08d698fe0adc1c29ef34e 100644
--- a/data/json/SpellDefinition/891.json
+++ b/data/json/SpellDefinition/891.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 891,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/892.json b/data/json/SpellDefinition/892.json
index d9a291e461f2b87ccb28bd69081cbcc6dd2b3e0f..287ff6a97a14839367fc6d784307bc58c67cc745 100644
--- a/data/json/SpellDefinition/892.json
+++ b/data/json/SpellDefinition/892.json
@@ -4,25 +4,36 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 892,
+    "merchantCosts": [],
     "tags": [
       10
     ],
     "details": {
       "type": "SpellDetails",
-      "element": 4,
-      "equipable": true,
+      "element": 6,
+      "equipable": false,
       "families": [
         7
       ]
     },
-    "gaugeToModifyOnSpellPlay": [],
+    "gaugeToModifyOnSpellPlay": [
+      {
+        "type": "GaugeValue",
+        "element": 57,
+        "value": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1
+        }
+      }
+    ],
     "costs": [
       {
         "type": "ActionPointsCost",
         "value": {
           "type": "ConstIntegerValue",
           "referenceId": "",
-          "value": 13
+          "value": 8
         }
       }
     ],
@@ -90,11 +101,6 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        },
         "MECHANISM",
         {
           "type": 7,
@@ -104,10 +110,10 @@
     }
   },
   "m_displayName": "XELOR - Xelocube Vide",
-  "m_availability": 0,
+  "m_availability": 3,
   "m_i18nNameId": 10921,
   "m_i18nDescriptionId": 58355,
   "m_elementaryStates": 1,
-  "assetGuid": "",
+  "assetGuid": "3cd0c87f1876aa74eae906e06eef85b4",
   "size": 0
 }
\ No newline at end of file
diff --git a/data/json/SpellDefinition/893.json b/data/json/SpellDefinition/893.json
index 1ed64213d2b7afa072ec2076d781cd1966e020de..c8f335ed9c2e7d74064d876bc0c2f789d1c628ca 100644
--- a/data/json/SpellDefinition/893.json
+++ b/data/json/SpellDefinition/893.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 893,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/894.json b/data/json/SpellDefinition/894.json
index 6cb7e892c2a4e984f7e72832d21712437063db7b..b5b8b7e5c9a4cd4eb728ea16e9a2dd55c6f6ce3d 100644
--- a/data/json/SpellDefinition/894.json
+++ b/data/json/SpellDefinition/894.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 894,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/896.json b/data/json/SpellDefinition/896.json
index 76535b8f3a29a1aa69a68c1386d54fff22f06156..585a0242b15d760d392a31db08b1e86c6f2e4ebf 100644
--- a/data/json/SpellDefinition/896.json
+++ b/data/json/SpellDefinition/896.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 896,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/898.json b/data/json/SpellDefinition/898.json
index b87fd32f42ca1e6a125e855493c5e62788e916ed..8488706a9be0db437b616e8decc81df34d53fbf0 100644
--- a/data/json/SpellDefinition/898.json
+++ b/data/json/SpellDefinition/898.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 898,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
@@ -35,21 +42,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              2,
-              3
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
@@ -81,7 +75,7 @@
             {
               "type": "ConstIntegerValue",
               "referenceId": "at",
-              "value": 8
+              "value": 40
             },
             {
               "type": "MultValue",
@@ -90,7 +84,7 @@
                 {
                   "type": "ConstIntegerValue",
                   "referenceId": "boost",
-                  "value": 4
+                  "value": 20
                 },
                 {
                   "type": "SpellsCountValue",
@@ -125,7 +119,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 8
+          "value": 40
         },
         {
           "type": "MultValue",
@@ -134,7 +128,7 @@
             {
               "type": "ConstIntegerValue",
               "referenceId": "boost",
-              "value": 4
+              "value": 20
             },
             {
               "type": "SpellsCountValue",
@@ -167,7 +161,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "boost",
-          "value": 4
+          "value": 20
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/899.json b/data/json/SpellDefinition/899.json
index 51dddec24573faf38cfed29542a2ea9ac572a959..003b8b85423478b2424d8c135c033edf51714f26 100644
--- a/data/json/SpellDefinition/899.json
+++ b/data/json/SpellDefinition/899.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 899,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -78,26 +79,27 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 9.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 12.1,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "FLOOR",
         {
           "type": 6,
diff --git a/data/json/SpellDefinition/9.json b/data/json/SpellDefinition/9.json
index a3c9d3a1c6658a947a14ae69accd7969af9cbb8a..181939ea43ecba1b247dd562ebfebcb4c486f61b 100644
--- a/data/json/SpellDefinition/9.json
+++ b/data/json/SpellDefinition/9.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 9,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/90.json b/data/json/SpellDefinition/90.json
index 456b7b4c951aa0ad2dd4609c46de7d33a0a56b4c..e31881f9014e5b6cc81dc2beaf7321a125615397 100644
--- a/data/json/SpellDefinition/90.json
+++ b/data/json/SpellDefinition/90.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 90,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/900.json b/data/json/SpellDefinition/900.json
index 81bff5f6db92c154bd624784d41952e2fd724314..78aebbce1522466c296bae7cf51b5c94266fc900 100644
--- a/data/json/SpellDefinition/900.json
+++ b/data/json/SpellDefinition/900.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 900,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/901.json b/data/json/SpellDefinition/901.json
index 26b052eae658665665250f79ad4d12d570b7dc45..013c82e15f379dbee4ca1c422c31f0157e1c6485 100644
--- a/data/json/SpellDefinition/901.json
+++ b/data/json/SpellDefinition/901.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 901,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,9 +56,6 @@
                 "value": 1
               }
             }
-          },
-          {
-            "type": "CellValidForCharacterFilter"
           }
         ]
       }
@@ -92,7 +90,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE ABRAKNYDE - Déracinement",
diff --git a/data/json/SpellDefinition/902.json b/data/json/SpellDefinition/902.json
index 1486be1543f8ab10a7e32e4cac28a6407bb66409..3415993bfc9662431d67e4a91db0c91d2480c823 100644
--- a/data/json/SpellDefinition/902.json
+++ b/data/json/SpellDefinition/902.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 902,
+    "merchantCosts": [],
     "tags": [
       4
     ],
diff --git a/data/json/SpellDefinition/904.json b/data/json/SpellDefinition/904.json
index bef854e3fe79789acbec69d25a6a18735b538702..0c2b0550ad246cdad1c2199c90d35940ebde05f5 100644
--- a/data/json/SpellDefinition/904.json
+++ b/data/json/SpellDefinition/904.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 904,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         7
       ]
diff --git a/data/json/SpellDefinition/905.json b/data/json/SpellDefinition/905.json
index fc8279a1c942f3d08798f44af34bad101c79227a..b6951cd209e371cea0a0b7f76a8ebd6c9833e057 100644
--- a/data/json/SpellDefinition/905.json
+++ b/data/json/SpellDefinition/905.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 905,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/908.json b/data/json/SpellDefinition/908.json
index be13b4597ecff99942cca898e9b1409cc4d18ba1..83d651cc2e1a32790826372b93b2be0efe98e62e 100644
--- a/data/json/SpellDefinition/908.json
+++ b/data/json/SpellDefinition/908.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 908,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -60,21 +61,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 22.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 27.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
diff --git a/data/json/SpellDefinition/909.json b/data/json/SpellDefinition/909.json
index bd344b48d942ae802bb4f186a8998c39b9b43d24..c3faa42db315883c9a5d9b863c062b1763218d97 100644
--- a/data/json/SpellDefinition/909.json
+++ b/data/json/SpellDefinition/909.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 909,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -62,21 +63,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 13.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/91.json b/data/json/SpellDefinition/91.json
index 4a385d9c0eeb5adf88b8e50776cdd1b6e703e272..3cbd8f8ba496c6db87eb3a32701fc7579b7e7d90 100644
--- a/data/json/SpellDefinition/91.json
+++ b/data/json/SpellDefinition/91.json
@@ -4,13 +4,14 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 91,
+    "merchantCosts": [],
     "tags": [
       0
     ],
     "details": {
       "type": "SpellDetails",
       "element": 6,
-      "equipable": true,
+      "equipable": false,
       "families": [
         1
       ]
diff --git a/data/json/SpellDefinition/911.json b/data/json/SpellDefinition/911.json
index f8f781cc1e1360b98d3f13de64081f606f0a99ca..15353862b0737c1d3bf1e384dae16692eda8490f 100644
--- a/data/json/SpellDefinition/911.json
+++ b/data/json/SpellDefinition/911.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 911,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        1
+        1,
+        73
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/912.json b/data/json/SpellDefinition/912.json
index 29f0827c08cb78d75d563407c7a023b546ae3033..3a5a1c812c5716fbeb837ba789c322d54bac0eae 100644
--- a/data/json/SpellDefinition/912.json
+++ b/data/json/SpellDefinition/912.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 912,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/913.json b/data/json/SpellDefinition/913.json
index 162d066c07762d7bf47002993f0bde9daf8a510d..ce70fe54364c38277b1fe224e723f03939a4bc77 100644
--- a/data/json/SpellDefinition/913.json
+++ b/data/json/SpellDefinition/913.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 913,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -43,7 +44,7 @@
     "spellEffectData": [
       {
         "type": "SpellEffectInstantiationData",
-        "spellEffect": "381203b4e09bdbc4cba795bffe224b88",
+        "spellEffect": "28128e71b9242754ba0780528c17e488",
         "originTarget": {
           "type": "FirstCastTargetSelector"
         }
@@ -70,7 +71,9 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "CHAMPIONAURA"
+        "CHAMPIONAURA",
+        "FROZEN",
+        "DEATHBLOW"
       ]
     }
   },
diff --git a/data/json/SpellDefinition/915.json b/data/json/SpellDefinition/915.json
index f0e1024c05322beae59418d9c4ff19ce8ba64303..813f06ad991385350263a5e5e3132150c8aaeecc 100644
--- a/data/json/SpellDefinition/915.json
+++ b/data/json/SpellDefinition/915.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 915,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/916.json b/data/json/SpellDefinition/916.json
index e62e24afd5365006c96faa6c462bc43bb22101ba..5d7bed3d4459ee2158169a3e43c5c2a76b893bee 100644
--- a/data/json/SpellDefinition/916.json
+++ b/data/json/SpellDefinition/916.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 916,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/92.json b/data/json/SpellDefinition/92.json
index e509686525aa6e37c7c0a887be19f0c3d50a6f49..5e139a50cab56b646c760049d7fe3825e448d6fd 100644
--- a/data/json/SpellDefinition/92.json
+++ b/data/json/SpellDefinition/92.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 92,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/920.json b/data/json/SpellDefinition/920.json
index 30d730311595d15e4f11718b51010ed8380c2abb..48d350ebd0a17f44e3f487de4537ba0de1bd2f72 100644
--- a/data/json/SpellDefinition/920.json
+++ b/data/json/SpellDefinition/920.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 920,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -67,12 +68,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/923.json b/data/json/SpellDefinition/923.json
index d74ef53dfba8d27713df9a377ed5970842f1fdef..2e8e6f987852b89aec2a757030bd7ea884292eed 100644
--- a/data/json/SpellDefinition/923.json
+++ b/data/json/SpellDefinition/923.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 923,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -46,21 +47,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 19.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/924.json b/data/json/SpellDefinition/924.json
index a40cd98dec9346dd628ffa67f5b7519595c1fe6d..9e70e432a0d82e9d65726366c666430a53d1e8b6 100644
--- a/data/json/SpellDefinition/924.json
+++ b/data/json/SpellDefinition/924.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 924,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/925.json b/data/json/SpellDefinition/925.json
index 8fa0996d1d89ef65cbd0ff20cf9b2245db0aa07a..ea3871e851dc1ea9d36f6760dedbf2c7e667afcf 100644
--- a/data/json/SpellDefinition/925.json
+++ b/data/json/SpellDefinition/925.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 925,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/927.json b/data/json/SpellDefinition/927.json
index eac32745b3159f45f0d19555193c93da980433ca..a4d8650b357a9283c21b15be46ce66c35a09a00a 100644
--- a/data/json/SpellDefinition/927.json
+++ b/data/json/SpellDefinition/927.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 927,
+    "merchantCosts": [],
     "tags": [
       0
     ],
diff --git a/data/json/SpellDefinition/929.json b/data/json/SpellDefinition/929.json
index a83f4bb41f0fd0410a855e7138d6743d277a6149..9f8e9f52f359fc72a87bdb815249e4b1f0b4c299 100644
--- a/data/json/SpellDefinition/929.json
+++ b/data/json/SpellDefinition/929.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 929,
+    "merchantCosts": [],
     "tags": [
       4
     ],
diff --git a/data/json/SpellDefinition/93.json b/data/json/SpellDefinition/93.json
index cbb59734be952ade03044fc086c7b68699ba704d..cd68e6e10c2e0a28d13532a7be9b75b31eb98203 100644
--- a/data/json/SpellDefinition/93.json
+++ b/data/json/SpellDefinition/93.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 93,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,30 +56,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 19.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg2",
           "baseValue": 5.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/930.json b/data/json/SpellDefinition/930.json
index 872f87b5f1cd6ce922b14a20ed03ca2777ec2307..d5aacee2ffff345b35f0c32f7a1abef0f81fc2c3 100644
--- a/data/json/SpellDefinition/930.json
+++ b/data/json/SpellDefinition/930.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 930,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/931.json b/data/json/SpellDefinition/931.json
index d16ecc838676cde38f62588b95b7d53eb623851a..2fede49b2ca2fd905174d393dccc6d0141620d36 100644
--- a/data/json/SpellDefinition/931.json
+++ b/data/json/SpellDefinition/931.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 931,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -84,22 +85,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "atmin",
-          "baseValue": 7.4,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "atmax",
-          "baseValue": 9.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 40
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/934.json b/data/json/SpellDefinition/934.json
index adbc713d6b7fc262e4867ada9a6930bc95341447..97784e506f559f40af8981b1b001de2b6533045d 100644
--- a/data/json/SpellDefinition/934.json
+++ b/data/json/SpellDefinition/934.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 934,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/936.json b/data/json/SpellDefinition/936.json
index 4dcc66d455fec0be9075d8d4909bd4315378a41a..68cbf9b69a932730da2a37c2435647f5daab6888 100644
--- a/data/json/SpellDefinition/936.json
+++ b/data/json/SpellDefinition/936.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 936,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/937.json b/data/json/SpellDefinition/937.json
index f6180302d0b3b4efb5bb3807e6a0d36f9bef7eb6..6ebf5e224fe95113f05e19244d98ad189cbe0e05 100644
--- a/data/json/SpellDefinition/937.json
+++ b/data/json/SpellDefinition/937.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 937,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/938.json b/data/json/SpellDefinition/938.json
index a77c2f19dafeaba533cf8e46ea15c497d220e877..08796b24792c321eaa83f8cbe912c7cbf20b8e67 100644
--- a/data/json/SpellDefinition/938.json
+++ b/data/json/SpellDefinition/938.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 938,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/939.json b/data/json/SpellDefinition/939.json
index 70d228f0f23b6b2316268041ef727892ce617ebf..f3c017990a17d6f683286a829b89bc8807c72703 100644
--- a/data/json/SpellDefinition/939.json
+++ b/data/json/SpellDefinition/939.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 939,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 11.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 14.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/94.json b/data/json/SpellDefinition/94.json
index acba36b19b021b876d4296dcd747127f8f7c868c..b5d283f44ae737a0131d4f6d5fe3bf4d515610fa 100644
--- a/data/json/SpellDefinition/94.json
+++ b/data/json/SpellDefinition/94.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 94,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 6,
       "equipable": true,
       "families": [
-        3
+        3,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/940.json b/data/json/SpellDefinition/940.json
index 913fc1a9adb80e0ed6a7488d2178e8e52170b984..52e1ce252381d20ea66cfe193efb38f02b38f79f 100644
--- a/data/json/SpellDefinition/940.json
+++ b/data/json/SpellDefinition/940.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 940,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -70,21 +71,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 21.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 26.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/942.json b/data/json/SpellDefinition/942.json
index a8904133a7d059e00e3613bba186163be99e2fc7..2010988ed00b12bba9b4c9b1bc683bb5be4b99e0 100644
--- a/data/json/SpellDefinition/942.json
+++ b/data/json/SpellDefinition/942.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 942,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/943.json b/data/json/SpellDefinition/943.json
index 50ce3bb941634bed25d8a9b8af1af570b353a564..c9e20af98a4b66f996e4fb1370182ba1a735de30 100644
--- a/data/json/SpellDefinition/943.json
+++ b/data/json/SpellDefinition/943.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 943,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/944.json b/data/json/SpellDefinition/944.json
index 867a9ecc4a7c869e60b33ff54a61e77f0f61eaf2..9a65b1432284c8e9e54ac895d8e87df5641a40e8 100644
--- a/data/json/SpellDefinition/944.json
+++ b/data/json/SpellDefinition/944.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 944,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/945.json b/data/json/SpellDefinition/945.json
index c3ae52db36b715e58ce90bf94987bddb24906f6f..517e72fb6bf6309be36989efdfa5de9e1ac3f34e 100644
--- a/data/json/SpellDefinition/945.json
+++ b/data/json/SpellDefinition/945.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 945,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/946.json b/data/json/SpellDefinition/946.json
index 5feed2eae2daab9d75532e838155bc2161d6e1aa..c3007b6040b69a94502610bce0eefe93d3d7cccd 100644
--- a/data/json/SpellDefinition/946.json
+++ b/data/json/SpellDefinition/946.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 946,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/947.json b/data/json/SpellDefinition/947.json
index 9723062893a7233add750edbd3a4b8d4eb7c16e5..4da40e9cedbf19e31e31f167b5a900c5e3c713ae 100644
--- a/data/json/SpellDefinition/947.json
+++ b/data/json/SpellDefinition/947.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 947,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/949.json b/data/json/SpellDefinition/949.json
index e3cb590f99a8f4dfffc99f5e555b1fe3a1696803..8f4e82fa8177441794c0becf7cd10672f3798650 100644
--- a/data/json/SpellDefinition/949.json
+++ b/data/json/SpellDefinition/949.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 949,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/95.json b/data/json/SpellDefinition/95.json
index 1f35a7ca74997072cb82f7e75ab9cb60f9523ec3..8851710dc04f0201c455a8bc28fc79b81157b54b 100644
--- a/data/json/SpellDefinition/95.json
+++ b/data/json/SpellDefinition/95.json
@@ -4,13 +4,15 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 95,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 4,
       "equipable": true,
       "families": [
-        7
+        7,
+        74
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/950.json b/data/json/SpellDefinition/950.json
index 3202eb4f07b431506490498eca6d89d8e0846472..2d6badd3b6fefb7fb74b4a8e7932f31b54392868 100644
--- a/data/json/SpellDefinition/950.json
+++ b/data/json/SpellDefinition/950.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 950,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -80,13 +81,9 @@
           "value": 2
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 12.8,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 80
         }
       ],
       "hasEffects": true,
diff --git a/data/json/SpellDefinition/955.json b/data/json/SpellDefinition/955.json
index 7edf94a6fdb635734ef5f9944cb527426ebc2c98..06bc17b22353125db7532739117cc964d863bd8d 100644
--- a/data/json/SpellDefinition/955.json
+++ b/data/json/SpellDefinition/955.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 955,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -56,21 +57,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 18.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/956.json b/data/json/SpellDefinition/956.json
index d9fe870e88f824dd584ec417dcaa3cef49b6cbbe..6523cc397d3f199527063d7a0011207f0c309e76 100644
--- a/data/json/SpellDefinition/956.json
+++ b/data/json/SpellDefinition/956.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 956,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/957.json b/data/json/SpellDefinition/957.json
index 68ce55af17d989af15c21f79b64630cc2f0889d8..867382f84f90acf0224e209aeedc30b766bbf380 100644
--- a/data/json/SpellDefinition/957.json
+++ b/data/json/SpellDefinition/957.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 957,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,21 +56,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 15.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/96.json b/data/json/SpellDefinition/96.json
index b22689887c8fce8f8d71422b5a99933817099ff3..fd402492fe61e4efe2e1c19c88edf510e06ade04 100644
--- a/data/json/SpellDefinition/96.json
+++ b/data/json/SpellDefinition/96.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 96,
+    "merchantCosts": [],
     "tags": [
       10
     ],
@@ -12,7 +13,8 @@
       "element": 3,
       "equipable": true,
       "families": [
-        7
+        7,
+        20
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/961.json b/data/json/SpellDefinition/961.json
index c7670cbb854025a2ddc119b288fe16ae63602ad6..57e0e9499df9a0700fce0708e90157f3862597ad 100644
--- a/data/json/SpellDefinition/961.json
+++ b/data/json/SpellDefinition/961.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 961,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -61,21 +62,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.7,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 17.9,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/962.json b/data/json/SpellDefinition/962.json
index 1e64819e24cdf73b1ba98b67dba971c04ee20c59..961b508c5d2771dc656d87bec44005c2c43a6e60 100644
--- a/data/json/SpellDefinition/962.json
+++ b/data/json/SpellDefinition/962.json
@@ -4,11 +4,12 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 962,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 2,
-      "equipable": false,
+      "equipable": true,
       "families": []
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/963.json b/data/json/SpellDefinition/963.json
index 8155d15824b00605c708de93dec7a3a02a0a0634..3964d9c8623ef5d4e24e316c387a9c0ef8db85f7 100644
--- a/data/json/SpellDefinition/963.json
+++ b/data/json/SpellDefinition/963.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 963,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/964.json b/data/json/SpellDefinition/964.json
index 0fabb4139798702f0014d78e49f707e9c5922625..fc93a43edf7f7c199e0a9c2b6b4f373cf8fe2334 100644
--- a/data/json/SpellDefinition/964.json
+++ b/data/json/SpellDefinition/964.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 964,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/965.json b/data/json/SpellDefinition/965.json
index 351becd4777bc9e2ec2ecc69db8959a4c36d3ebe..8db21e415c1f7ca7e418df015effb63a0c6d9f8e 100644
--- a/data/json/SpellDefinition/965.json
+++ b/data/json/SpellDefinition/965.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 965,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/966.json b/data/json/SpellDefinition/966.json
index f8871b80a3d4d246507655146b87b4ecb3a97317..03c8c605aace6b695389f3efc7ca157ce89116e4 100644
--- a/data/json/SpellDefinition/966.json
+++ b/data/json/SpellDefinition/966.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 966,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/969.json b/data/json/SpellDefinition/969.json
index 223215d9c39e0611962db28c90d263406bec9975..041fc97f3677055bfd60089b0469dacb455d86de 100644
--- a/data/json/SpellDefinition/969.json
+++ b/data/json/SpellDefinition/969.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 969,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/970.json b/data/json/SpellDefinition/970.json
index e8bcb7ea0887be497c567c8fd92a9ad6d5b1f042..f40cf84d67c2a86d81dd61275e4b3a6aff9cbf68 100644
--- a/data/json/SpellDefinition/970.json
+++ b/data/json/SpellDefinition/970.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 970,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/971.json b/data/json/SpellDefinition/971.json
index d9e6a67c5d63a2996e6cbce4cd4428b66a64b381..f5da0b8d51259531377829bcf6dd293e75b56704 100644
--- a/data/json/SpellDefinition/971.json
+++ b/data/json/SpellDefinition/971.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 971,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -72,21 +73,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 14.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 19.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/972.json b/data/json/SpellDefinition/972.json
index 6339423d161ecd292b4c8f9059a03120eb8be5fc..f13d7ac20671dca3c66b4cc2b1432a55e5b5758a 100644
--- a/data/json/SpellDefinition/972.json
+++ b/data/json/SpellDefinition/972.json
@@ -4,11 +4,18 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 972,
+    "merchantCosts": [
+      {
+        "type": "CurrencyCost",
+        "currencyType": 0,
+        "amount": 5000
+      }
+    ],
     "tags": [],
     "details": {
       "type": "SpellDetails",
       "element": 1,
-      "equipable": false,
+      "equipable": true,
       "families": [
         67
       ]
@@ -37,21 +44,8 @@
     "castTarget": {
       "type": "OneCastTargetDefinition",
       "selector": {
-        "type": "FilteredEntitySelector",
-        "from": {
-          "type": "AllEntitiesSelector"
-        },
-        "filters": [
-          {
-            "type": "EntityTypeFilter",
-            "condition": 1,
-            "entityTypes": [
-              1,
-              3,
-              2
-            ]
-          }
-        ]
+        "type": "FilteredCharacterSelector",
+        "filters": []
       }
     },
     "spellEffectData": [
diff --git a/data/json/SpellDefinition/973.json b/data/json/SpellDefinition/973.json
index a82d3eff8b06c428d12244afb9a0ac5698c2291d..d9166b31f3634a44fe5ae9b246749a8295bf4980 100644
--- a/data/json/SpellDefinition/973.json
+++ b/data/json/SpellDefinition/973.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 973,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -45,21 +46,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 12.6,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 15.8,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/974.json b/data/json/SpellDefinition/974.json
index 55eb1dc377ffc1693bb296659182b4827c89c135..475eba781e89abd7fa7c1b9796732b79f157544a 100644
--- a/data/json/SpellDefinition/974.json
+++ b/data/json/SpellDefinition/974.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 974,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/975.json b/data/json/SpellDefinition/975.json
index fabb0066063cc4ca18f01e8c604a8aa1b0ea707b..b2d289c1cdd68a86f87f1bf873563adaaef0696d 100644
--- a/data/json/SpellDefinition/975.json
+++ b/data/json/SpellDefinition/975.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 975,
+    "merchantCosts": [],
     "tags": [
       10
     ],
@@ -12,7 +13,8 @@
       "element": 2,
       "equipable": true,
       "families": [
-        7
+        7,
+        20
       ]
     },
     "gaugeToModifyOnSpellPlay": [
diff --git a/data/json/SpellDefinition/976.json b/data/json/SpellDefinition/976.json
index 40d3796d4d9abd9954072604e497ed616bf17a83..612f0d33e2dffb4afa7613dec0051db87b431cd5 100644
--- a/data/json/SpellDefinition/976.json
+++ b/data/json/SpellDefinition/976.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 976,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/978.json b/data/json/SpellDefinition/978.json
index 162f079c25115942c6b05ad819be6b8846070285..b47b86c711e1fddb46cf31379fe6f58ca532b3b5 100644
--- a/data/json/SpellDefinition/978.json
+++ b/data/json/SpellDefinition/978.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 978,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/979.json b/data/json/SpellDefinition/979.json
index 5836456883263a58db70478f9112273612dd8ff1..d9b40438be75766524bfc92b54f4bd6b0df64304 100644
--- a/data/json/SpellDefinition/979.json
+++ b/data/json/SpellDefinition/979.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 979,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/983.json b/data/json/SpellDefinition/983.json
index 407b0eefe450445d363895f57962fab7a7bbe3e2..bdd4b46c5b83ab1b90afa7a437e06627506e86f2 100644
--- a/data/json/SpellDefinition/983.json
+++ b/data/json/SpellDefinition/983.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 983,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/9852.json b/data/json/SpellDefinition/9852.json
index be230c1149461ac18d5962f691027d58a13d4374..a4a57238f6e17f4658e2ab8bab360685a680fc8f 100644
--- a/data/json/SpellDefinition/9852.json
+++ b/data/json/SpellDefinition/9852.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 9852,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -55,12 +56,12 @@
           "value": 4
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/987.json b/data/json/SpellDefinition/987.json
index 048cc3a8566338d39fc6ee04c5415665a336c961..74b647dcb7699cdfed62918ec16a4aa43da9dfcf 100644
--- a/data/json/SpellDefinition/987.json
+++ b/data/json/SpellDefinition/987.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 987,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SpellDefinition/988.json b/data/json/SpellDefinition/988.json
index b87646479ed57e82f29198e299890db7d4d60f40..984636ab4dd1bbbb77836fd9803cea37313b8784 100644
--- a/data/json/SpellDefinition/988.json
+++ b/data/json/SpellDefinition/988.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 988,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/989.json b/data/json/SpellDefinition/989.json
index 8f6ff61abeb557487cda1f691930869c7eb27d67..2a1771abe8f05d5aa35183db558a4aabadc79971 100644
--- a/data/json/SpellDefinition/989.json
+++ b/data/json/SpellDefinition/989.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 989,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/99.json b/data/json/SpellDefinition/99.json
index 029f24b8e78b6c3f802fad1335187f802d4c5354..9da4966783f00ed55f28b218a001c3e962f1ebca 100644
--- a/data/json/SpellDefinition/99.json
+++ b/data/json/SpellDefinition/99.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 99,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/990.json b/data/json/SpellDefinition/990.json
index b05aaa55f508dcde6dd5a34eb945b727da063a66..23aa6ffd8231f0ca675d6db6985946cc8760f759 100644
--- a/data/json/SpellDefinition/990.json
+++ b/data/json/SpellDefinition/990.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 990,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/991.json b/data/json/SpellDefinition/991.json
index 5e511743409813480a19686ac2a78351df273999..61c73067153581164effae993e92c87cd27d58b3 100644
--- a/data/json/SpellDefinition/991.json
+++ b/data/json/SpellDefinition/991.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 991,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/9923.json b/data/json/SpellDefinition/9923.json
index 0c7d8e6632c860afc3df9e8544cdf4aefbcd3ddf..f4221d291de633385bcefb2c3571fc29237b9ea5 100644
--- a/data/json/SpellDefinition/9923.json
+++ b/data/json/SpellDefinition/9923.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 9923,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -75,21 +76,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 6.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "max",
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         }
       ],
diff --git a/data/json/SpellDefinition/993.json b/data/json/SpellDefinition/993.json
index c14ee3a52d9c595f2d098c70d398950507969bcd..255f82665624b448df0505e2f7da3eb99ca9c029 100644
--- a/data/json/SpellDefinition/993.json
+++ b/data/json/SpellDefinition/993.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 993,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/994.json b/data/json/SpellDefinition/994.json
index dfdc446e8b52f4826d66b69e99f349455e6fe015..e66720296c1512d60402622e399b85f595af57a7 100644
--- a/data/json/SpellDefinition/994.json
+++ b/data/json/SpellDefinition/994.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 994,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -106,6 +107,7 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "DRAGEGG"
       ]
     }
diff --git a/data/json/SpellDefinition/995.json b/data/json/SpellDefinition/995.json
index efa21687d7e9fe37a64cdab1e6d40ad9be4d0fa3..efd2b518d538d898f043b9fdd8a14d0949c0d8f3 100644
--- a/data/json/SpellDefinition/995.json
+++ b/data/json/SpellDefinition/995.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 995,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/996.json b/data/json/SpellDefinition/996.json
index c3df797e736bf1fb7e7b2027e14696e2e023e082..377909997aef13c39ab0e5fcc4a063d983537c8a 100644
--- a/data/json/SpellDefinition/996.json
+++ b/data/json/SpellDefinition/996.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 996,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
diff --git a/data/json/SpellDefinition/997.json b/data/json/SpellDefinition/997.json
index c619c14a482e56541ff9b41827e70d55c6694cbc..fa2d296c12f63f6c6656e5a26dd8d7396e2b04a9 100644
--- a/data/json/SpellDefinition/997.json
+++ b/data/json/SpellDefinition/997.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 997,
+    "merchantCosts": [],
     "tags": [],
     "details": {
       "type": "SpellDetails",
@@ -38,13 +39,8 @@
               "type": "FirstCastTargetSelector"
             },
             "distance": {
-              "type": "Between",
-              "minIncluded": {
-                "type": "ConstIntegerValue",
-                "referenceId": "",
-                "value": 0
-              },
-              "maxIncluded": {
+              "type": "EqualsTo",
+              "dynamicValue": {
                 "type": "ConstIntegerValue",
                 "referenceId": "",
                 "value": 1
@@ -72,21 +68,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 17.5,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 21.3,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
@@ -96,7 +92,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     }
   },
   "m_displayName": "MONSTRE TAURE - Ruade",
diff --git a/data/json/SpellDefinition/998.json b/data/json/SpellDefinition/998.json
index b714eab372c40e153616e127f15a1d70742eba62..9ae0e97e8ec94d9bc325b2e5c198d0ca2a5ae236 100644
--- a/data/json/SpellDefinition/998.json
+++ b/data/json/SpellDefinition/998.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 998,
+    "merchantCosts": [],
     "tags": [
       3
     ],
diff --git a/data/json/SpellDefinition/999.json b/data/json/SpellDefinition/999.json
index 75e3fb4ec60c71463355147b20b938a3e129e96e..f323c96dca52b674d9effab5f0cbab3d26142131 100644
--- a/data/json/SpellDefinition/999.json
+++ b/data/json/SpellDefinition/999.json
@@ -4,6 +4,7 @@
   "m_jsonRepresentation": {
     "type": "SpellDefinition",
     "id": 999,
+    "merchantCosts": [],
     "tags": [
       2
     ],
diff --git a/data/json/SquadDefinition/112.json b/data/json/SquadDefinition/112.json
index 96223f67e2b7da58d260d029846bc329ee69fd78..ee4a17fde24353b4204a1b580b26b5ca885625b2 100644
--- a/data/json/SquadDefinition/112.json
+++ b/data/json/SquadDefinition/112.json
@@ -35,7 +35,8 @@
       1907,
       794,
       462,
-      2035
+      2035,
+      455
     ]
   },
   "m_displayName": "OSAMODAS - Éleveur Zélé",
diff --git a/data/json/SquadDefinition/171.json b/data/json/SquadDefinition/171.json
index fd237ed003a67543099cbf00aa27145236360167..43d5e573540e5874f5de8123e960d7249e21adac 100644
--- a/data/json/SquadDefinition/171.json
+++ b/data/json/SquadDefinition/171.json
@@ -35,7 +35,8 @@
       472,
       56,
       8,
-      726
+      726,
+      535
     ]
   },
   "m_displayName": "ENIRIPSA - Lame Voracius",
diff --git a/data/json/SquadDefinition/235.json b/data/json/SquadDefinition/235.json
index 45b93122efb06b07a92bbf6862e56af80f479a56..5be5085a082a8acaaf58580bcf38d3600c772719 100644
--- a/data/json/SquadDefinition/235.json
+++ b/data/json/SquadDefinition/235.json
@@ -35,7 +35,8 @@
       755,
       372,
       597,
-      490
+      490,
+      915
     ]
   },
   "m_displayName": "IOP - Flamboyante Kasaï",
diff --git a/data/json/SquadDefinition/239.json b/data/json/SquadDefinition/239.json
index 128557e02651a445fe0dcb2a13e0df3ba08c124a..54ecb7c821511e0ea92a4a72dd4110c2cf9dd776 100644
--- a/data/json/SquadDefinition/239.json
+++ b/data/json/SquadDefinition/239.json
@@ -35,7 +35,8 @@
       328,
       121,
       675,
-      158
+      158,
+      555
     ]
   },
   "m_displayName": "XELOR - Sabliaton Jikan",
diff --git a/data/json/SquadDefinition/26.json b/data/json/SquadDefinition/26.json
index 38fa68f30baffb1b56bfa4f0155538602942a71a..b20019cda36abd445a20ce1f4a1fc0ecf0b921ac 100644
--- a/data/json/SquadDefinition/26.json
+++ b/data/json/SquadDefinition/26.json
@@ -35,7 +35,8 @@
       293,
       956,
       5912,
-      306
+      306,
+      479
     ]
   },
   "m_displayName": "SACRIEUR - Darde Kan",
diff --git a/data/json/SquadDefinition/306.json b/data/json/SquadDefinition/306.json
index 110c42c28801a0317d26db32c29b2b3745ebba36..c3a2226ecd0aebc0b0110ecdd5af3329fb8e89f8 100644
--- a/data/json/SquadDefinition/306.json
+++ b/data/json/SquadDefinition/306.json
@@ -35,7 +35,8 @@
       279,
       930,
       544,
-      616
+      616,
+      223
     ]
   },
   "m_displayName": "SRAM - Lame Ouraï",
diff --git a/data/json/SquadDefinition/313.json b/data/json/SquadDefinition/313.json
index 2ea047a443dea6e15f521ab4bc37463d01220f61..f7888bf389fc39e528277c3988cda915a724ef07 100644
--- a/data/json/SquadDefinition/313.json
+++ b/data/json/SquadDefinition/313.json
@@ -35,7 +35,8 @@
       168,
       217,
       856,
-      705
+      705,
+      674
     ]
   },
   "m_displayName": "IOP - Bouvaloir Orok",
diff --git a/data/json/SquadDefinition/316.json b/data/json/SquadDefinition/316.json
index c639ae747cba46aa1e15e4804f8d2cbcea4c3dba..72cd2aca2d0443bf9a930adaa24ec98c4f9b3ab0 100644
--- a/data/json/SquadDefinition/316.json
+++ b/data/json/SquadDefinition/316.json
@@ -35,7 +35,8 @@
       3678,
       471,
       99,
-      732
+      732,
+      539
     ]
   },
   "m_displayName": "CRA - Arc Piven",
diff --git a/data/json/SquadDefinition/355.json b/data/json/SquadDefinition/355.json
index de17843f7850a450020931ee860aca240e543550..b6f8b96a1b6cae36f4029f014524ed3817ea2b1f 100644
--- a/data/json/SquadDefinition/355.json
+++ b/data/json/SquadDefinition/355.json
@@ -35,7 +35,8 @@
       408,
       88,
       353,
-      567
+      567,
+      282
     ]
   },
   "m_displayName": "OSAMODAS - Pâtre Laineux",
diff --git a/data/json/SquadDefinition/366.json b/data/json/SquadDefinition/366.json
index a7f17f65f2f44b197b331b66897331fc00e970a8..a49a0f10d23ee3d68b271825a1b9f8ea9784b485 100644
--- a/data/json/SquadDefinition/366.json
+++ b/data/json/SquadDefinition/366.json
@@ -35,7 +35,8 @@
       990,
       613,
       445,
-      5477
+      5477,
+      515
     ]
   },
   "m_displayName": "SACRIEUR - Ombraden",
diff --git a/data/json/SquadDefinition/377.json b/data/json/SquadDefinition/377.json
index 8b1c3f56de88c80a2919339888f91bf15dbae5dd..16a946853f396cfd2f6c5177779cecd83c37c66c 100644
--- a/data/json/SquadDefinition/377.json
+++ b/data/json/SquadDefinition/377.json
@@ -21,10 +21,6 @@
       {
         "type": "CompanionInfo",
         "companion": 316
-      },
-      {
-        "type": "CompanionInfo",
-        "companion": 689
       }
     ],
     "spells": [
@@ -35,7 +31,8 @@
       460,
       685,
       516,
-      233
+      233,
+      30
     ]
   },
   "m_displayName": "ENIRIPSA - Gemme Déphsante",
diff --git a/data/json/SquadDefinition/396.json b/data/json/SquadDefinition/396.json
index 3e8313e2d00c2513d9e113cee26dca7195def5a9..234bff74cd838c44e12dd3251d019550cea009eb 100644
--- a/data/json/SquadDefinition/396.json
+++ b/data/json/SquadDefinition/396.json
@@ -35,7 +35,8 @@
       358,
       475,
       407,
-      618
+      618,
+      686
     ]
   },
   "m_displayName": "SRAM - Ecorcheur Shugen",
diff --git a/data/json/SquadDefinition/402.json b/data/json/SquadDefinition/402.json
index 699f0074a5756c5c8bc887b924e47e2a016734d1..6009237b2124b37f22dd23f36f6c5095afd31bb3 100644
--- a/data/json/SquadDefinition/402.json
+++ b/data/json/SquadDefinition/402.json
@@ -35,7 +35,8 @@
       219,
       996,
       241,
-      841
+      841,
+      291
     ]
   },
   "m_displayName": "OSAMODAS - Maître Froussard",
diff --git a/data/json/SquadDefinition/47.json b/data/json/SquadDefinition/47.json
index c89786fc253abbd7140cee7aa5b7c8e700af218f..df81121055010c52c27271fbc713497d05385f6c 100644
--- a/data/json/SquadDefinition/47.json
+++ b/data/json/SquadDefinition/47.json
@@ -34,8 +34,9 @@
       3,
       96,
       113,
-      831,
-      829
+      512,
+      829,
+      655
     ]
   },
   "m_displayName": "XELOR - Régulant Gurpapa",
diff --git a/data/json/SquadDefinition/499.json b/data/json/SquadDefinition/499.json
index 5d449744881ea012804f3d18097a523e4ec19c1b..bcc7cb44aeee26d190370c8f1c99ab1ce0a8e178 100644
--- a/data/json/SquadDefinition/499.json
+++ b/data/json/SquadDefinition/499.json
@@ -35,7 +35,8 @@
       891,
       430,
       946,
-      387
+      387,
+      448
     ]
   },
   "m_displayName": "IOP - Glaive Stalaktoss",
diff --git a/data/json/SquadDefinition/512.json b/data/json/SquadDefinition/512.json
index 923b61f99ffadb8caa081c5837d6f4bb30e3843e..8cd28edab21bfaf7fd96d4951ff7f49eb5561ee9 100644
--- a/data/json/SquadDefinition/512.json
+++ b/data/json/SquadDefinition/512.json
@@ -21,10 +21,6 @@
       {
         "type": "CompanionInfo",
         "companion": 316
-      },
-      {
-        "type": "CompanionInfo",
-        "companion": 689
       }
     ],
     "spells": [
@@ -35,7 +31,8 @@
       735,
       295,
       552,
-      830
+      830,
+      3332
     ]
   },
   "m_displayName": "CRA - Shiru Shaden",
diff --git a/data/json/SquadDefinition/534.json b/data/json/SquadDefinition/534.json
index ad728bf2d1b2d143e56c2e2ba704f27a73b3ff13..b6fbc91ec8c29d018c6106141ba10b155d4c2191 100644
--- a/data/json/SquadDefinition/534.json
+++ b/data/json/SquadDefinition/534.json
@@ -35,7 +35,8 @@
       533,
       3886,
       883,
-      858
+      858,
+      964
     ]
   },
   "m_displayName": "CRA - Voldorak Vo",
diff --git a/data/json/SquadDefinition/573.json b/data/json/SquadDefinition/573.json
index 9b8f43b18e7f908426bfcd234a865e1220d395f5..7957c90d6322c628042e94ee399bf9c7dd33c105 100644
--- a/data/json/SquadDefinition/573.json
+++ b/data/json/SquadDefinition/573.json
@@ -35,7 +35,8 @@
       6647,
       171,
       536,
-      825
+      825,
+      394
     ]
   },
   "m_displayName": "SACRIEUR - Pilobouli",
diff --git a/data/json/SquadDefinition/593.json b/data/json/SquadDefinition/593.json
index 214f6ef50e072f8b32e3ae6be1774b8d6f56f132..9ce598677ead99c4110a9488ec23f978e7829b14 100644
--- a/data/json/SquadDefinition/593.json
+++ b/data/json/SquadDefinition/593.json
@@ -35,7 +35,8 @@
       3129,
       769,
       287,
-      965
+      965,
+      647
     ]
   },
   "m_displayName": "OSAMODAS - Dompteur d\u0027Épines",
diff --git a/data/json/SquadDefinition/611.json b/data/json/SquadDefinition/611.json
index c30e11a5d80735c365817d0ba012ec5e8aa48344..ee473d619071cd0ea810e7a0df1ccf43e9c93494 100644
--- a/data/json/SquadDefinition/611.json
+++ b/data/json/SquadDefinition/611.json
@@ -35,7 +35,8 @@
       168,
       740,
       737,
-      674
+      674,
+      330
     ]
   },
   "m_displayName": "IOP - Justelame Brutale",
diff --git a/data/json/SquadDefinition/632.json b/data/json/SquadDefinition/632.json
deleted file mode 100644
index 470d5cb227c227facba9d947ff5aa14e9860ca46..0000000000000000000000000000000000000000
--- a/data/json/SquadDefinition/632.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "632",
-  "m_jsonRepresentation": {
-    "type": "SquadDefinition",
-    "id": 632,
-    "weapon": {
-      "type": "WeaponInfo",
-      "weapon": 659,
-      "skills": []
-    },
-    "companions": [
-      {
-        "type": "CompanionInfo",
-        "companion": 229
-      },
-      {
-        "type": "CompanionInfo",
-        "companion": 601
-      },
-      {
-        "type": "CompanionInfo",
-        "companion": 339
-      },
-      {
-        "type": "CompanionInfo",
-        "companion": 144
-      }
-    ],
-    "spells": [
-      234,
-      530,
-      372,
-      755,
-      537,
-      428,
-      311,
-      915
-    ]
-  },
-  "m_displayName": "TEMPLE IOP - Flamboyante Kasai",
-  "m_availability": 2
-}
\ No newline at end of file
diff --git a/data/json/SquadDefinition/693.json b/data/json/SquadDefinition/693.json
index 16af84dd8926b8fa0be663a501cdc95c2209eb4b..5a221101259669361c13b281898a4ee95f1ffb27 100644
--- a/data/json/SquadDefinition/693.json
+++ b/data/json/SquadDefinition/693.json
@@ -35,7 +35,8 @@
       686,
       678,
       358,
-      618
+      618,
+      475
     ]
   },
   "m_displayName": "SRAM - Surin Sourokan",
diff --git a/data/json/SquadDefinition/695.json b/data/json/SquadDefinition/695.json
index 8909db9a58dae793784ea99e9629e9691b40449d..84fd4cc5d037b9f53ab734667532a6a511c01791 100644
--- a/data/json/SquadDefinition/695.json
+++ b/data/json/SquadDefinition/695.json
@@ -35,7 +35,8 @@
       852,
       944,
       826,
-      112
+      112,
+      912
     ]
   },
   "m_displayName": "CRA - Expingole",
diff --git a/data/json/SquadDefinition/718.json b/data/json/SquadDefinition/718.json
index 1ebc4684e7f4ad2f6e14e62e046d02da665e4758..8de72df316314de9282a5fe6d58b81fc6ddce7e0 100644
--- a/data/json/SquadDefinition/718.json
+++ b/data/json/SquadDefinition/718.json
@@ -35,7 +35,8 @@
       724,
       361,
       94,
-      13927
+      13927,
+      438
     ]
   },
   "m_displayName": "ENIRIPSA - Pinceau Kokoro",
diff --git a/data/json/SquadDefinition/763.json b/data/json/SquadDefinition/763.json
index 93a687488fb819f822c890ec971964a6001bf992..544fea3eae2f339afe50f5ac62fb0fe5499427c1 100644
--- a/data/json/SquadDefinition/763.json
+++ b/data/json/SquadDefinition/763.json
@@ -35,7 +35,8 @@
       394,
       6647,
       144,
-      226
+      226,
+      860
     ]
   },
   "m_displayName": "SACRIEUR - Bâton Tonfavik",
diff --git a/data/json/SquadDefinition/778.json b/data/json/SquadDefinition/778.json
index d2948db457ab49082b91842c3cbd340397c67f82..1e341ac3105f095c7e19b56ddf7b3e0ce0ded979 100644
--- a/data/json/SquadDefinition/778.json
+++ b/data/json/SquadDefinition/778.json
@@ -35,7 +35,8 @@
       567,
       88,
       353,
-      13913
+      13913,
+      408
     ]
   },
   "m_displayName": "OSAMODAS - Dresseur Rocailleux",
diff --git a/data/json/SquadDefinition/8.json b/data/json/SquadDefinition/8.json
index 553850c0157e6aaffbe375ca592390ea134b32c9..2c70bc09350515ee866b98a80ff02758058e7d25 100644
--- a/data/json/SquadDefinition/8.json
+++ b/data/json/SquadDefinition/8.json
@@ -35,7 +35,8 @@
       187,
       63,
       13927,
-      438
+      438,
+      681
     ]
   },
   "m_displayName": "ENIRIPSA - Scalpel de l\u0027Apostruker",
diff --git a/data/json/SquadDefinition/80.json b/data/json/SquadDefinition/80.json
index 2d7c4792df1d0401c7c223765540f2f320258da1..29c0e8b9b1ff3c194c8478f48c43b4b0b90fa192 100644
--- a/data/json/SquadDefinition/80.json
+++ b/data/json/SquadDefinition/80.json
@@ -32,10 +32,11 @@
       779,
       743,
       818,
-      323,
+      947,
       369,
       147,
-      652
+      652,
+      824
     ]
   },
   "m_displayName": "XELOR - Catalysateur Pramium",
diff --git a/data/json/SquadDefinition/827.json b/data/json/SquadDefinition/827.json
index 295e0b6baf8d64561b60724f7ec5e1f000642962..e67f2194938e3f7c30271c9bb1d5226e6ff01950 100644
--- a/data/json/SquadDefinition/827.json
+++ b/data/json/SquadDefinition/827.json
@@ -35,7 +35,8 @@
       343,
       905,
       152,
-      117
+      117,
+      473
     ]
   },
   "m_displayName": "ENIRIPSA - Ambre Tamashi",
diff --git a/data/json/SquadDefinition/85.json b/data/json/SquadDefinition/85.json
index e80d62325259847abdc950125a88d2e21d0916cc..c4f0655b026ccfbe07a1f989709539dec0a25019 100644
--- a/data/json/SquadDefinition/85.json
+++ b/data/json/SquadDefinition/85.json
@@ -35,7 +35,8 @@
       738,
       73,
       934,
-      301
+      301,
+      192
     ]
   },
   "m_displayName": "SACRIEUR - Gantares des Cendres",
diff --git a/data/json/SquadDefinition/871.json b/data/json/SquadDefinition/871.json
index dc088f8e53c60c9650618d00c2d6aace83f14acc..bc1eca85124730bd0897a662c4cea69b4d1ffbff 100644
--- a/data/json/SquadDefinition/871.json
+++ b/data/json/SquadDefinition/871.json
@@ -35,7 +35,8 @@
       638,
       568,
       700,
-      677
+      677,
+      599
     ]
   },
   "m_displayName": "SRAM - Cisaille Orishi",
diff --git a/data/json/SquadDefinition/872.json b/data/json/SquadDefinition/872.json
index 76f333493df2d3aa26d4c8fffbb8c6ab806259b2..0216252acd460a19a6f697368cd2d00b21fd0893 100644
--- a/data/json/SquadDefinition/872.json
+++ b/data/json/SquadDefinition/872.json
@@ -35,7 +35,8 @@
       482,
       617,
       33,
-      295
+      295,
+      552
     ]
   },
   "m_displayName": "CRA - Bunelame",
diff --git a/data/json/SquadDefinition/932.json b/data/json/SquadDefinition/932.json
index 73c85a070cb1ca446146b6d354f020a44b557fa5..08956adbc19b9797433f86d6e913f0428c5e82a3 100644
--- a/data/json/SquadDefinition/932.json
+++ b/data/json/SquadDefinition/932.json
@@ -35,7 +35,8 @@
       397,
       236,
       758,
-      142
+      142,
+      649
     ]
   },
   "m_displayName": "IOP - Lamarguedon Spectral",
diff --git a/data/json/SquadDefinition/938.json b/data/json/SquadDefinition/938.json
index 49fb377f4a4f4b548f12d872ce1263d0536e722f..fc56fd1ba5a66f08c47dd7739d5ea82c342119ca 100644
--- a/data/json/SquadDefinition/938.json
+++ b/data/json/SquadDefinition/938.json
@@ -35,7 +35,8 @@
       163,
       79,
       21,
-      717
+      717,
+      890
     ]
   },
   "m_displayName": "XELOR - Aiguille Pikuxala",
diff --git a/data/json/SquadDefinition/939.json b/data/json/SquadDefinition/939.json
index 08287b941f0ad4522710a844be5e0d033c880506..5f86f886586ae4329e4ce80a9fb57ecfb5ecd943 100644
--- a/data/json/SquadDefinition/939.json
+++ b/data/json/SquadDefinition/939.json
@@ -35,7 +35,8 @@
       143,
       854,
       75,
-      308
+      308,
+      877
     ]
   },
   "m_displayName": "SRAM - Ken Kartana",
diff --git a/data/json/SquadDefinition/976.json b/data/json/SquadDefinition/976.json
index 82c372c6de113754cc61f4e4f6effd8aa16e6fb9..52e12a11af61c517e04eef6e22c291abd5eef733 100644
--- a/data/json/SquadDefinition/976.json
+++ b/data/json/SquadDefinition/976.json
@@ -34,8 +34,9 @@
       975,
       555,
       359,
-      155,
-      682
+      776,
+      682,
+      121
     ]
   },
   "m_displayName": "XELOR - Synchronisateur Tako",
diff --git a/data/json/SubAchievementDefinition/1.json b/data/json/SubAchievementDefinition/1.json
index 57b9f208e660b9a0e8ec119290de54dda50d8c51..d1d959d1d2eec11536926537ff24eed5919f03ac 100644
--- a/data/json/SubAchievementDefinition/1.json
+++ b/data/json/SubAchievementDefinition/1.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 1,
-    "parentDataId": 220,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 220
+    },
     "completionThreshold": 500
   },
   "m_displayName": "CHAFER - Hub - 500 Chafers",
diff --git a/data/json/SubAchievementDefinition/111.json b/data/json/SubAchievementDefinition/111.json
index cfb828251395f109294766b889d8fc4974911aaf..07cb819dc6da67c956728959377ab5c2c7b72cb9 100644
--- a/data/json/SubAchievementDefinition/111.json
+++ b/data/json/SubAchievementDefinition/111.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 111,
-    "parentDataId": 817,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 817
+    },
     "completionThreshold": 50
   },
   "m_displayName": "COCHON - HUB - 09 Subir 50 effets de Collision",
diff --git a/data/json/SubAchievementDefinition/114.json b/data/json/SubAchievementDefinition/114.json
index 373e4b19693571777d9406eb5e6861bdb15f8704..230ec7d51f6f4c491a2b0e973d48002cf9475ca9 100644
--- a/data/json/SubAchievementDefinition/114.json
+++ b/data/json/SubAchievementDefinition/114.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 114,
-    "parentDataId": 155,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 155
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - BRONZE - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/115.json b/data/json/SubAchievementDefinition/115.json
index 27870bac7c217a744c82b7eb4984322d804b7a8e..d466f9d8db6514568604f26de7c2f351e480487b 100644
--- a/data/json/SubAchievementDefinition/115.json
+++ b/data/json/SubAchievementDefinition/115.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 115,
-    "parentDataId": 2510,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2510
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TOFU - Dungeon - 50 challenges",
diff --git a/data/json/SubAchievementDefinition/116.json b/data/json/SubAchievementDefinition/116.json
index a731b263ffc3af2a526b22286a9226a93f2899f5..775ad30eb1a03ebd874b715e3f3fb1602f75bd58 100644
--- a/data/json/SubAchievementDefinition/116.json
+++ b/data/json/SubAchievementDefinition/116.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 116,
-    "parentDataId": 315,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 315
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/117.json b/data/json/SubAchievementDefinition/117.json
index 11f2ac41520b36744b74bff874cda3f74b460494..4266820b9a7c3f1eff101499ad44c9df138dd92a 100644
--- a/data/json/SubAchievementDefinition/117.json
+++ b/data/json/SubAchievementDefinition/117.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 117,
-    "parentDataId": 114,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 114
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre 100 PUPUCES",
diff --git a/data/json/SubAchievementDefinition/118.json b/data/json/SubAchievementDefinition/118.json
index dbaa756747a6d3db79da6695fe0e09f11f65ce0a..b6182c3479febff76fcc463b48fad8ba3a9a7be5 100644
--- a/data/json/SubAchievementDefinition/118.json
+++ b/data/json/SubAchievementDefinition/118.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 118,
-    "parentDataId": 137,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 137
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/119.json b/data/json/SubAchievementDefinition/119.json
index 45b416ea23a0e54702f3f78407e22b9bbff071e4..aeb623078470102c18c83bacb495f23905534a28 100644
--- a/data/json/SubAchievementDefinition/119.json
+++ b/data/json/SubAchievementDefinition/119.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 119,
-    "parentDataId": 750,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 750
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - [TODO] 23",
diff --git a/data/json/SubAchievementDefinition/123.json b/data/json/SubAchievementDefinition/123.json
index 28b9fd37d89d8ee19622e2eec2da44e62b8c23a4..6be4a02a24934123c8d5dff9ab9517493fd1e233 100644
--- a/data/json/SubAchievementDefinition/123.json
+++ b/data/json/SubAchievementDefinition/123.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 123,
-    "parentDataId": 78,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 78
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Achievement 5",
diff --git a/data/json/SubAchievementDefinition/124.json b/data/json/SubAchievementDefinition/124.json
index 502e76d1140b4b3df271e5b7f3940832e7c6796b..065baf77362b67eec0c7cd6ba8049209144f0b54 100644
--- a/data/json/SubAchievementDefinition/124.json
+++ b/data/json/SubAchievementDefinition/124.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 124,
-    "parentDataId": 604,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 604
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - [TODO] 14",
diff --git a/data/json/SubAchievementDefinition/126.json b/data/json/SubAchievementDefinition/126.json
index c9d7558575d9880d2bf4f7f1017020affe5dd550..f7b132e31e633c23902772891f5c36609740e60f 100644
--- a/data/json/SubAchievementDefinition/126.json
+++ b/data/json/SubAchievementDefinition/126.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 126,
-    "parentDataId": 756,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 756
+    },
     "completionThreshold": 50
   },
   "m_displayName": "COCHON - Dungeon - 12 Réussir 50 Challenges",
diff --git a/data/json/SubAchievementDefinition/13.json b/data/json/SubAchievementDefinition/13.json
index 162704c92ec9b818803ad4467163dbd745f8ec14..be414291bd4f8ac12c20490d2add67a66e109c90 100644
--- a/data/json/SubAchievementDefinition/13.json
+++ b/data/json/SubAchievementDefinition/13.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 13,
-    "parentDataId": 269,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 269
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - ARGENT - Vaincre un boss sans perte",
diff --git a/data/json/SubAchievementDefinition/130.json b/data/json/SubAchievementDefinition/130.json
index 604b632ac14a2bb652cf947df86ee89b0bb1ef09..343236ce88ca388284bdd1576cfa6ef527deda54 100644
--- a/data/json/SubAchievementDefinition/130.json
+++ b/data/json/SubAchievementDefinition/130.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 130,
-    "parentDataId": 113,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 113
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - WIP 1",
diff --git a/data/json/SubAchievementDefinition/133.json b/data/json/SubAchievementDefinition/133.json
index 11d5aa916a385f9b234ba423fc0b69de088f2886..003103273b20682925828565c18592f325c67b86 100644
--- a/data/json/SubAchievementDefinition/133.json
+++ b/data/json/SubAchievementDefinition/133.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 133,
-    "parentDataId": 243,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 243
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 10 Chapitre X",
diff --git a/data/json/SubAchievementDefinition/139.json b/data/json/SubAchievementDefinition/139.json
index dcdbf5a7db521b626bff7b412646afac1ed55d3d..95cc8e6efcde900c835eeefddd721f1453d5b4ce 100644
--- a/data/json/SubAchievementDefinition/139.json
+++ b/data/json/SubAchievementDefinition/139.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 139,
-    "parentDataId": 131,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 131
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - VI",
diff --git a/data/json/SubAchievementDefinition/14.json b/data/json/SubAchievementDefinition/14.json
index 8d056e21710e83f8f5c34f61dba886406cc4f89d..ac12a3c31d1e7c61b4fc21edbb2fdc586421630b 100644
--- a/data/json/SubAchievementDefinition/14.json
+++ b/data/json/SubAchievementDefinition/14.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 14,
-    "parentDataId": 221,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 221
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Remporter un combat sans jamais finir son tour avec un Tofu envolé",
diff --git a/data/json/SubAchievementDefinition/140.json b/data/json/SubAchievementDefinition/140.json
index cdd0f121f120c4ed4a61476287a36a5ab0de4de1..63152f5820f0f374446e4b6854c052f6c344448d 100644
--- a/data/json/SubAchievementDefinition/140.json
+++ b/data/json/SubAchievementDefinition/140.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 140,
-    "parentDataId": 883,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 883
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/141.json b/data/json/SubAchievementDefinition/141.json
index 56647575fee07d4731bf8a81469924aeb4224736..76d6be300b31cc879f43e7b8910a1f65f4616ca3 100644
--- a/data/json/SubAchievementDefinition/141.json
+++ b/data/json/SubAchievementDefinition/141.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 141,
-    "parentDataId": 734,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 734
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BWORK - Hub - Activer 100 rages",
diff --git a/data/json/SubAchievementDefinition/142.json b/data/json/SubAchievementDefinition/142.json
index 3089f2d75c78e8ae6f170f913861222b41dfb4a1..3701f41ca8279326d43974fd2022082abd27b2e0 100644
--- a/data/json/SubAchievementDefinition/142.json
+++ b/data/json/SubAchievementDefinition/142.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 142,
-    "parentDataId": 743,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 743
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - [TODO] 14",
diff --git a/data/json/SubAchievementDefinition/146.json b/data/json/SubAchievementDefinition/146.json
index e3cec3010b8ad56a88d9d60b7669dc1aeefdc6f2..2a2e93c9f8e79ec73652f698d19aa8b69876cb75 100644
--- a/data/json/SubAchievementDefinition/146.json
+++ b/data/json/SubAchievementDefinition/146.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 146,
-    "parentDataId": 577,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 577
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Remporter un combat en achevant un Tofu Foutu avant qu\u0027il n\u0027attaque une seule fois",
diff --git a/data/json/SubAchievementDefinition/151.json b/data/json/SubAchievementDefinition/151.json
index db338eb0e944eff72c85bf0930e533658b3acc8d..8a2c20a79874b87a32afdfab6cc94eef6a4f8a89 100644
--- a/data/json/SubAchievementDefinition/151.json
+++ b/data/json/SubAchievementDefinition/151.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 151,
-    "parentDataId": 543,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 543
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - [TODO] 22",
diff --git a/data/json/SubAchievementDefinition/152.json b/data/json/SubAchievementDefinition/152.json
index 370e6d2a629fe921e1bc9d23223881c559b3e821..1a853b3802f0569026b390b0c2af40ebe4e30f43 100644
--- a/data/json/SubAchievementDefinition/152.json
+++ b/data/json/SubAchievementDefinition/152.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 152,
-    "parentDataId": 306,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 306
+    },
     "completionThreshold": 20
   },
   "m_displayName": "TOFU - Dungeon - 20 challenges",
diff --git a/data/json/SubAchievementDefinition/153.json b/data/json/SubAchievementDefinition/153.json
index 1e045eb69580534a1e866731c4e830904cbbf64a..f707fd56b494faa67a741b63efb892ade48d5a07 100644
--- a/data/json/SubAchievementDefinition/153.json
+++ b/data/json/SubAchievementDefinition/153.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 153,
-    "parentDataId": 74,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 74
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 07 Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/155.json b/data/json/SubAchievementDefinition/155.json
index 8ba930b71845cd1c45c11b5dcd40f1fec61fae4b..2240ad0f95197abf50074a4a6f1d422a16567973 100644
--- a/data/json/SubAchievementDefinition/155.json
+++ b/data/json/SubAchievementDefinition/155.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 155,
-    "parentDataId": 94,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 94
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Aider Creuzar sans qu\u0027il tombe KO une seule fois",
diff --git a/data/json/SubAchievementDefinition/159.json b/data/json/SubAchievementDefinition/159.json
index 6bde7f20e87ec994fcd2a80070761a6c9b7d2c44..a7df4b0bd875b0082d4b47a3b3121d385498a771 100644
--- a/data/json/SubAchievementDefinition/159.json
+++ b/data/json/SubAchievementDefinition/159.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 159,
-    "parentDataId": 636,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 636
+    },
     "completionThreshold": 250
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre 250 BOUFTOUS",
diff --git a/data/json/SubAchievementDefinition/161.json b/data/json/SubAchievementDefinition/161.json
index 400501d3f3788fb4d14a27c84a377b81d9139cc5..a551c271e279bbd395447d0b3be44e42afc6f415 100644
--- a/data/json/SubAchievementDefinition/161.json
+++ b/data/json/SubAchievementDefinition/161.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 161,
-    "parentDataId": 791,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 791
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - X",
diff --git a/data/json/SubAchievementDefinition/167.json b/data/json/SubAchievementDefinition/167.json
index ffbe59b2d94eeaa454769b9f1f85a79bd1502ec6..d7d3206a95d0784a2a97cab21119f56b612a1ba2 100644
--- a/data/json/SubAchievementDefinition/167.json
+++ b/data/json/SubAchievementDefinition/167.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 167,
-    "parentDataId": 497,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 497
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre 100 BOUFTOUS MALADES",
diff --git a/data/json/SubAchievementDefinition/1699.json b/data/json/SubAchievementDefinition/1699.json
index 5f0261427ff48177bb8f728b51e7041fe10d6fd7..8dab673f14c644256248ef6b5813fd9ed4df020f 100644
--- a/data/json/SubAchievementDefinition/1699.json
+++ b/data/json/SubAchievementDefinition/1699.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 1699,
-    "parentDataId": 62,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 62
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/17.json b/data/json/SubAchievementDefinition/17.json
index 75f927776c04ad8fdb1c727b5728f625d4ce5c5f..6b331847c9be527eb33c49b26d92ce4ed8faa65b 100644
--- a/data/json/SubAchievementDefinition/17.json
+++ b/data/json/SubAchievementDefinition/17.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 17,
-    "parentDataId": 959,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 959
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/170.json b/data/json/SubAchievementDefinition/170.json
index 6c8ecd2322d962c9b6c70d41c237f14981a91a04..96aa95344b1ea548e8eaf39f222bd27d346b6750 100644
--- a/data/json/SubAchievementDefinition/170.json
+++ b/data/json/SubAchievementDefinition/170.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 170,
-    "parentDataId": 202,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 202
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 18 Aider Sir Hector à récupérer son équipement",
diff --git a/data/json/SubAchievementDefinition/173.json b/data/json/SubAchievementDefinition/173.json
index 1aa090ea68db608bc4d6e896b5d6a4f29791cc98..f8783ff2311d0761abd8d57756fc3d4ddd28e822 100644
--- a/data/json/SubAchievementDefinition/173.json
+++ b/data/json/SubAchievementDefinition/173.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 173,
-    "parentDataId": 1626,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 1626
+    },
     "completionThreshold": 50
   },
   "m_displayName": "CHUCHOTEUR - HUB - 07 Avoir subi 50 fois l\u0027état Chuchoté",
diff --git a/data/json/SubAchievementDefinition/175.json b/data/json/SubAchievementDefinition/175.json
index 533440d47cc76bdc39ad3bdac71c44b7c00a0f5e..4cb05c82dcda454dbc93f3823d98c163e38626f9 100644
--- a/data/json/SubAchievementDefinition/175.json
+++ b/data/json/SubAchievementDefinition/175.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 175,
-    "parentDataId": 274,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 274
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/176.json b/data/json/SubAchievementDefinition/176.json
index 058fd280c62d22a69b4fd1381c8f0ce52efc5003..c4bafec8bf08e0965f54c04c5726f4c928122434 100644
--- a/data/json/SubAchievementDefinition/176.json
+++ b/data/json/SubAchievementDefinition/176.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 176,
-    "parentDataId": 253,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 253
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/177.json b/data/json/SubAchievementDefinition/177.json
index d8c6d91aef99c3d330c81d65113e20aa483fb605..8fcf96e81e0d8a75df5d05e0151d5173aa5e140e 100644
--- a/data/json/SubAchievementDefinition/177.json
+++ b/data/json/SubAchievementDefinition/177.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 177,
-    "parentDataId": 873,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 873
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - BRONZE - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/18.json b/data/json/SubAchievementDefinition/18.json
index e00c62caa0e9c434b3ca42d7e88a814947294c09..e724f55add6bcb1730ae4f7aa60484507edbe282 100644
--- a/data/json/SubAchievementDefinition/18.json
+++ b/data/json/SubAchievementDefinition/18.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 18,
-    "parentDataId": 108,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 108
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Vaincre le Chef du Clan en premier",
diff --git a/data/json/SubAchievementDefinition/180.json b/data/json/SubAchievementDefinition/180.json
index c757280821cd61711cdac64a9b250925057d4737..cab6dbdce70d4c32a2f2ab7315f37a1237a9cfdc 100644
--- a/data/json/SubAchievementDefinition/180.json
+++ b/data/json/SubAchievementDefinition/180.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 180,
-    "parentDataId": 790,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 790
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 19 Vaincre l\u0027Empereur en premier",
diff --git a/data/json/SubAchievementDefinition/181.json b/data/json/SubAchievementDefinition/181.json
index ad8c9e4d4383ea422ff5866fef878499307c8fa7..8348b1a8bd642d3833b207a965b29f4a6047e374 100644
--- a/data/json/SubAchievementDefinition/181.json
+++ b/data/json/SubAchievementDefinition/181.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 181,
-    "parentDataId": 434,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 434
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - OR - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/1819.json b/data/json/SubAchievementDefinition/1819.json
index 7e9de98b6f20c53a36b30413a64e4e72a4874bf8..9a04049e5f5513749f0ffcd5da0fa2ba01a7b57d 100644
--- a/data/json/SubAchievementDefinition/1819.json
+++ b/data/json/SubAchievementDefinition/1819.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 1819,
-    "parentDataId": 282,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 282
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/184.json b/data/json/SubAchievementDefinition/184.json
index d53e2f39067792f09ef46ff803fa7c6705c71f82..5db213873bf4c131e0f5050d80242b1dac58d7f3 100644
--- a/data/json/SubAchievementDefinition/184.json
+++ b/data/json/SubAchievementDefinition/184.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 184,
-    "parentDataId": 95,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 95
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - [TODO] 24",
diff --git a/data/json/SubAchievementDefinition/185.json b/data/json/SubAchievementDefinition/185.json
index 008981e446488c4bfa6e80341785cf9b0a54ba4e..a774e48e0007ccbdb572aa5bd67fbdb97b80c81b 100644
--- a/data/json/SubAchievementDefinition/185.json
+++ b/data/json/SubAchievementDefinition/185.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 185,
-    "parentDataId": 939,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 939
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/188.json b/data/json/SubAchievementDefinition/188.json
index f71fa47fb99de496cc6bcad8baa10a19e0f8e595..634658cc42dd52bb3ddbf08c5a58eb06d07463e9 100644
--- a/data/json/SubAchievementDefinition/188.json
+++ b/data/json/SubAchievementDefinition/188.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 188,
-    "parentDataId": 161,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 161
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 6",
diff --git a/data/json/SubAchievementDefinition/19.json b/data/json/SubAchievementDefinition/19.json
index d19c8caea39b990f15ed6aa846989d55267b5ac8..283c09dec88ec610c4f92a3116cf2bdc0e180a79 100644
--- a/data/json/SubAchievementDefinition/19.json
+++ b/data/json/SubAchievementDefinition/19.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 19,
-    "parentDataId": 139,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 139
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/192.json b/data/json/SubAchievementDefinition/192.json
index e4e1c860e1706067c579423bf8021bb320968678..54d10cbdea3d6dae5b22e72f428d5dc489a352a6 100644
--- a/data/json/SubAchievementDefinition/192.json
+++ b/data/json/SubAchievementDefinition/192.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 192,
-    "parentDataId": 978,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 978
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Achievement 1",
diff --git a/data/json/SubAchievementDefinition/198.json b/data/json/SubAchievementDefinition/198.json
index c8cd59960ff6449f32d9cd39baad3b269143b4e5..4a0ef4fc0c1db11baabdd1ffc4fe42b643815333 100644
--- a/data/json/SubAchievementDefinition/198.json
+++ b/data/json/SubAchievementDefinition/198.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 198,
-    "parentDataId": 552,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 552
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - HUB - 14 Subir au moins 15 Critiques en un seul combat",
diff --git a/data/json/SubAchievementDefinition/2.json b/data/json/SubAchievementDefinition/2.json
index 2d44b243a5be2ef158893467b95c3c6e0f2fca39..4d50c13582e0b2011c31aabb903faf9d070f7f4c 100644
--- a/data/json/SubAchievementDefinition/2.json
+++ b/data/json/SubAchievementDefinition/2.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 2,
-    "parentDataId": 1605,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 1605
+    },
     "completionThreshold": 50
   },
   "m_displayName": "CHUCHOTEUR - HUB - 04 Remporter 50 combats",
diff --git a/data/json/SubAchievementDefinition/20.json b/data/json/SubAchievementDefinition/20.json
index 2c49b3d12f54a4517b394d873f89072e6e8097ff..eb42816c444df1ecbcc96677276eea3d7f6f2d0a 100644
--- a/data/json/SubAchievementDefinition/20.json
+++ b/data/json/SubAchievementDefinition/20.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 20,
-    "parentDataId": 802,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 802
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - OR - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/2007.json b/data/json/SubAchievementDefinition/2007.json
index fad2bab6da11b64f644a2435a9a54124493a9de7..28eefe3e09b0f55f8f8e25383a8a830e572234e4 100644
--- a/data/json/SubAchievementDefinition/2007.json
+++ b/data/json/SubAchievementDefinition/2007.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 2007,
-    "parentDataId": 605,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 605
+    },
     "completionThreshold": 20
   },
   "m_displayName": "BOUFTOU - DONJON - Réussir 20 challenges en donjon",
diff --git a/data/json/SubAchievementDefinition/201.json b/data/json/SubAchievementDefinition/201.json
index 4479a631b73c91817f94e130ef530dafb052a2ff..8baf11a3fef2b99c8f5cba1f8a83a112c3ad47fe 100644
--- a/data/json/SubAchievementDefinition/201.json
+++ b/data/json/SubAchievementDefinition/201.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 201,
-    "parentDataId": 141,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 141
+    },
     "completionThreshold": 15
   },
   "m_displayName": "CHUCHOTEUR - HUB - 14 Avoir attaqué 15 fois un allié en étant Chuchoté",
diff --git a/data/json/SubAchievementDefinition/207.json b/data/json/SubAchievementDefinition/207.json
index ac615f0e193e71edf1efe52d48cab604e965d495..9d11d26b06584658cb2bd5c9f4ca0000f4c529f5 100644
--- a/data/json/SubAchievementDefinition/207.json
+++ b/data/json/SubAchievementDefinition/207.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 207,
-    "parentDataId": 2982,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2982
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/208.json b/data/json/SubAchievementDefinition/208.json
index 0a80525b7b4fce54fbd90db27cd51e129d99b28b..0d006892d2bfca48fed767b49aae4a0a6c346054 100644
--- a/data/json/SubAchievementDefinition/208.json
+++ b/data/json/SubAchievementDefinition/208.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 208,
-    "parentDataId": 875,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 875
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/2097.json b/data/json/SubAchievementDefinition/2097.json
index 975761cbb378e2e698a76226957bd6e52999fadd..fc109d3b4589ec1f2b8f72845e0cbec2ff54acf4 100644
--- a/data/json/SubAchievementDefinition/2097.json
+++ b/data/json/SubAchievementDefinition/2097.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 2097,
-    "parentDataId": 233,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 233
+    },
     "completionThreshold": 250
   },
   "m_displayName": "COCHON - HUB - 02 Vaincre 250 Cochons",
diff --git a/data/json/SubAchievementDefinition/210.json b/data/json/SubAchievementDefinition/210.json
index c37f011d520187294bd39062c898fa953fae63e4..76c63a080861a79ab1863e2703c96ee259030768 100644
--- a/data/json/SubAchievementDefinition/210.json
+++ b/data/json/SubAchievementDefinition/210.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 210,
-    "parentDataId": 326,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 326
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TOFU - Hub - Remporter 50 combats",
diff --git a/data/json/SubAchievementDefinition/214.json b/data/json/SubAchievementDefinition/214.json
index 435dc9756719cb4e9dc5b27240d74c95b5bb8f96..551fa129413d49b14300553d7ba77fd1104d73b5 100644
--- a/data/json/SubAchievementDefinition/214.json
+++ b/data/json/SubAchievementDefinition/214.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 214,
-    "parentDataId": 613,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 613
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Achever 10 adversaires avec Roméro en une seule traversée",
diff --git a/data/json/SubAchievementDefinition/215.json b/data/json/SubAchievementDefinition/215.json
index 5e3e205d791f4efade67b621134ba012185fbb73..fc96dc9b79b8b8f7cdc53fa8c7a5f5992ec8ce01 100644
--- a/data/json/SubAchievementDefinition/215.json
+++ b/data/json/SubAchievementDefinition/215.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 215,
-    "parentDataId": 762,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 762
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - III",
diff --git a/data/json/SubAchievementDefinition/218.json b/data/json/SubAchievementDefinition/218.json
index 152b0ceb74ab7582cc8ce3554c672a1c6c27b210..4cb9bf48abf77646c0c628d150d3b2249c9dba36 100644
--- a/data/json/SubAchievementDefinition/218.json
+++ b/data/json/SubAchievementDefinition/218.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 218,
-    "parentDataId": 460,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 460
+    },
     "completionThreshold": 20
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 14 Terminer 20 fois le donjon Chuchoteur",
diff --git a/data/json/SubAchievementDefinition/219.json b/data/json/SubAchievementDefinition/219.json
index b15c5119c73063627f1871f19f82c94d54aaa8e6..b8c9359187f48ebf3e41aab4a3bc6da3b9a47328 100644
--- a/data/json/SubAchievementDefinition/219.json
+++ b/data/json/SubAchievementDefinition/219.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 219,
-    "parentDataId": 894,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 894
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/22.json b/data/json/SubAchievementDefinition/22.json
index 5f1c08fbfc56243f2a1e844db794f80bf0249000..58d4b554900087e521136d22e65380b091845cc0 100644
--- a/data/json/SubAchievementDefinition/22.json
+++ b/data/json/SubAchievementDefinition/22.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 22,
-    "parentDataId": 542,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 542
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 03 Chapitre III",
diff --git a/data/json/SubAchievementDefinition/221.json b/data/json/SubAchievementDefinition/221.json
index e821d139baf2bb3234844f6c856da628081954b1..33ee5b20040414eea2195b58a0620081382680f4 100644
--- a/data/json/SubAchievementDefinition/221.json
+++ b/data/json/SubAchievementDefinition/221.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 221,
-    "parentDataId": 733,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 733
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/222.json b/data/json/SubAchievementDefinition/222.json
index f496c986f7a5be863bc2d3956f7ef25553b1feea..6c88dad9763a5ebec4339f020928049d91d029cd 100644
--- a/data/json/SubAchievementDefinition/222.json
+++ b/data/json/SubAchievementDefinition/222.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 222,
-    "parentDataId": 675,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 675
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Mourir sur un piège Chafer",
diff --git a/data/json/SubAchievementDefinition/223.json b/data/json/SubAchievementDefinition/223.json
index 7a7b9524c83cef85f0549280ad3266ad6dfd2a97..3fa4fbe8b1f3ec1b737cf285fe5b79c2c7693d44 100644
--- a/data/json/SubAchievementDefinition/223.json
+++ b/data/json/SubAchievementDefinition/223.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 223,
-    "parentDataId": 609,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 609
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/224.json b/data/json/SubAchievementDefinition/224.json
index 4412be6e0f932fae4060763ec40b0fb19cfe117b..9e97d24b63f82c70692f7761a48bb1634949d447 100644
--- a/data/json/SubAchievementDefinition/224.json
+++ b/data/json/SubAchievementDefinition/224.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 224,
-    "parentDataId": 271,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 271
+    },
     "completionThreshold": 10
   },
   "m_displayName": "CHUCHOTEUR - HUB - 15 Avoir été immobilisé 10 fois",
diff --git a/data/json/SubAchievementDefinition/227.json b/data/json/SubAchievementDefinition/227.json
index d54b302b6decaed98835a6bbc3653a73ba04ce4d..8b60f2f3c82bff4c9933918b1b1b67ed8e0fc0cd 100644
--- a/data/json/SubAchievementDefinition/227.json
+++ b/data/json/SubAchievementDefinition/227.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 227,
-    "parentDataId": 457,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 457
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/228.json b/data/json/SubAchievementDefinition/228.json
index c58a3b226ad40efc70368e4e4ae5a0e4b949e9ad..6fd476b04a06ffb2649528fffb65351cd82da1f1 100644
--- a/data/json/SubAchievementDefinition/228.json
+++ b/data/json/SubAchievementDefinition/228.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 228,
-    "parentDataId": 629,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 629
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - [TODO] 11",
diff --git a/data/json/SubAchievementDefinition/23.json b/data/json/SubAchievementDefinition/23.json
index 59c74460b25406cf50815790f66e6c87e2995a88..9f17cfa61c83117bf8368b0d111f4d6991ab8da2 100644
--- a/data/json/SubAchievementDefinition/23.json
+++ b/data/json/SubAchievementDefinition/23.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 23,
-    "parentDataId": 836,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 836
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - WIP 1",
diff --git a/data/json/SubAchievementDefinition/231.json b/data/json/SubAchievementDefinition/231.json
index c9389dddf3784447c7af665d137fc02cd1456720..5dc4d8dbf56bb2784e3507b39e0cdb5c2cfe4e91 100644
--- a/data/json/SubAchievementDefinition/231.json
+++ b/data/json/SubAchievementDefinition/231.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 231,
-    "parentDataId": 520,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 520
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre une BOUFLONNE en premier",
diff --git a/data/json/SubAchievementDefinition/234.json b/data/json/SubAchievementDefinition/234.json
index bca59739d6347b1be1d92046945c2c45b148b93d..ce90c4f32e77e9639ffe5d8ad6c8d58021678abb 100644
--- a/data/json/SubAchievementDefinition/234.json
+++ b/data/json/SubAchievementDefinition/234.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 234,
-    "parentDataId": 159,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 159
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - OR - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/235.json b/data/json/SubAchievementDefinition/235.json
index 8a002cab222de510d29a8e0cbc41c45f9541fe05..99cd218a3ed31fab8d28b6b020d338eeed3ed45e 100644
--- a/data/json/SubAchievementDefinition/235.json
+++ b/data/json/SubAchievementDefinition/235.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 235,
-    "parentDataId": 412,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 412
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - HUB - 12 Avoir subi au moins 6 attaques combo en un tour",
diff --git a/data/json/SubAchievementDefinition/236.json b/data/json/SubAchievementDefinition/236.json
index 9265d759115153f7c7348a6cd7d8e907d530c1f7..c0b9538b137be64acfe5fdbc2285e583fd68fc0f 100644
--- a/data/json/SubAchievementDefinition/236.json
+++ b/data/json/SubAchievementDefinition/236.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 236,
-    "parentDataId": 92,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 92
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - ARGENT - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/237.json b/data/json/SubAchievementDefinition/237.json
index 452957bef9a8fa7b0886556daf66025209ace833..7f29a8fdc1580904ba88dcb02afc62244f6c4546 100644
--- a/data/json/SubAchievementDefinition/237.json
+++ b/data/json/SubAchievementDefinition/237.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 237,
-    "parentDataId": 806,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 806
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Obtenir une bonne laine pour Raphl Lalen",
diff --git a/data/json/SubAchievementDefinition/2381.json b/data/json/SubAchievementDefinition/2381.json
index 71d4b66d4dd19ce0d27d396b8dcec87d112b66ad..af12bb362de8a76e670eb0669032eacdc453af98 100644
--- a/data/json/SubAchievementDefinition/2381.json
+++ b/data/json/SubAchievementDefinition/2381.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 2381,
-    "parentDataId": 728,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 728
+    },
     "completionThreshold": 50
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 12 Réussir 50 Challenges",
diff --git a/data/json/SubAchievementDefinition/239.json b/data/json/SubAchievementDefinition/239.json
index 3f7dbb9af861c2758aa6d9c1d0e830c7e7abf2fb..075c3ce657b476cfe0ac5dad58462de0067ecc3a 100644
--- a/data/json/SubAchievementDefinition/239.json
+++ b/data/json/SubAchievementDefinition/239.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 239,
-    "parentDataId": 628,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 628
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Achever un Crogneur en dernier",
diff --git a/data/json/SubAchievementDefinition/241.json b/data/json/SubAchievementDefinition/241.json
index 09a2aef98605c5be856b3b140f2c5741a05331c6..69f918d6f28aed4c9238f39af8560db47499c98c 100644
--- a/data/json/SubAchievementDefinition/241.json
+++ b/data/json/SubAchievementDefinition/241.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 241,
-    "parentDataId": 776,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 776
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/243.json b/data/json/SubAchievementDefinition/243.json
index 9f37674ac99baf08ad2fa7ad3b42279462c9fc43..2d68225d1b8eb96aa38b60d7803702ea10b185db 100644
--- a/data/json/SubAchievementDefinition/243.json
+++ b/data/json/SubAchievementDefinition/243.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 243,
-    "parentDataId": 871,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 871
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Retrouver la cargaison de Raskass",
diff --git a/data/json/SubAchievementDefinition/244.json b/data/json/SubAchievementDefinition/244.json
index 42bd90831f61ed852eccafac47d8444132140911..77ea4e58b7d56e5cdbf3f68ff4aa5b7e8a7efe04 100644
--- a/data/json/SubAchievementDefinition/244.json
+++ b/data/json/SubAchievementDefinition/244.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 244,
-    "parentDataId": 922,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 922
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - BRONZE - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/245.json b/data/json/SubAchievementDefinition/245.json
index d94b93ec3bb3bf83da0d72398361e61c04cea844..00c47232ad9fdb55c79f5da21ac83273a180ab01 100644
--- a/data/json/SubAchievementDefinition/245.json
+++ b/data/json/SubAchievementDefinition/245.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 245,
-    "parentDataId": 461,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 461
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Éliminer toutes les PUPUCES à tous les tours contre Cornan",
diff --git a/data/json/SubAchievementDefinition/247.json b/data/json/SubAchievementDefinition/247.json
index 436276b3290de20024c380fa692ef8d850e0a9fa..f94303203954e038d0bda08edeb926cb0c1f6d6e 100644
--- a/data/json/SubAchievementDefinition/247.json
+++ b/data/json/SubAchievementDefinition/247.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 247,
-    "parentDataId": 527,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 527
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Obtenir 1000 PQ",
diff --git a/data/json/SubAchievementDefinition/251.json b/data/json/SubAchievementDefinition/251.json
index 23ece5473879af251d9bd16bb3217e4033e02700..d7b6f04199815903352e02b475f4da11a4805fd8 100644
--- a/data/json/SubAchievementDefinition/251.json
+++ b/data/json/SubAchievementDefinition/251.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 251,
-    "parentDataId": 738,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 738
+    },
     "completionThreshold": 500
   },
   "m_displayName": "TAURE - Hub -  Vaincre 500 Taures",
diff --git a/data/json/SubAchievementDefinition/252.json b/data/json/SubAchievementDefinition/252.json
index add2a7343f47dbae3666cda529018fe22df282fd..5883398ed5efe376831cba882bda620d47ce3956 100644
--- a/data/json/SubAchievementDefinition/252.json
+++ b/data/json/SubAchievementDefinition/252.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 252,
-    "parentDataId": 707,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 707
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/254.json b/data/json/SubAchievementDefinition/254.json
index aa7878e11af5d4f1b332337d22c25a4d69262b75..226c217f8c6048d01b7b4d2be2f75d451edba699 100644
--- a/data/json/SubAchievementDefinition/254.json
+++ b/data/json/SubAchievementDefinition/254.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 254,
-    "parentDataId": 58,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 58
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/255.json b/data/json/SubAchievementDefinition/255.json
index eed40368c1f3b6a5e12fe3a163354e552e1e69f2..733cae0cb38be9c54560fdae5173e1eee8e00c8d 100644
--- a/data/json/SubAchievementDefinition/255.json
+++ b/data/json/SubAchievementDefinition/255.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 255,
-    "parentDataId": 414,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 414
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/256.json b/data/json/SubAchievementDefinition/256.json
index 44d305a2c93ebc2156f45c7e49e819c180884d84..2f3c911ac52ce402886b37465a4eecae873b86fa 100644
--- a/data/json/SubAchievementDefinition/256.json
+++ b/data/json/SubAchievementDefinition/256.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 256,
-    "parentDataId": 600,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 600
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Se faire repousser 2 fois par des Picoss en un seul tour",
diff --git a/data/json/SubAchievementDefinition/257.json b/data/json/SubAchievementDefinition/257.json
index aea75ea5b2de4abf7bb8b7b614c1ba06bbb01667..0bc2d00f1530e5913f1c154b470e709dcbc65f65 100644
--- a/data/json/SubAchievementDefinition/257.json
+++ b/data/json/SubAchievementDefinition/257.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 257,
-    "parentDataId": 760,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 760
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/258.json b/data/json/SubAchievementDefinition/258.json
index d6590a470035f35027fc99b600e39607950811c2..f7da62e6f9389f524212efd57a9d7b24b30879e3 100644
--- a/data/json/SubAchievementDefinition/258.json
+++ b/data/json/SubAchievementDefinition/258.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 258,
-    "parentDataId": 664,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 664
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 3",
diff --git a/data/json/SubAchievementDefinition/259.json b/data/json/SubAchievementDefinition/259.json
index bcbe366e01b51091ddcc561b361c0feecbe16df9..cc23935c52dda51a1fd081cd469fa76b84773ebb 100644
--- a/data/json/SubAchievementDefinition/259.json
+++ b/data/json/SubAchievementDefinition/259.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 259,
-    "parentDataId": 536,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 536
+    },
     "completionThreshold": 20
   },
   "m_displayName": "BWORK - Dungeon - Terminer 20 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/26.json b/data/json/SubAchievementDefinition/26.json
index e4eecbf717d42befa56cb0322d4ef7dec7f0a0da..d5d04728f2e485b71f608902c162bc78600ccd80 100644
--- a/data/json/SubAchievementDefinition/26.json
+++ b/data/json/SubAchievementDefinition/26.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 26,
-    "parentDataId": 450,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 450
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Vaincre le boss 2",
diff --git a/data/json/SubAchievementDefinition/260.json b/data/json/SubAchievementDefinition/260.json
index f5b6a577dfc27dc603a5de33edc7c5a6a84de228..d9adb5f8422664b30d2136c95f65e6bcf9b129fc 100644
--- a/data/json/SubAchievementDefinition/260.json
+++ b/data/json/SubAchievementDefinition/260.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 260,
-    "parentDataId": 590,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 590
+    },
     "completionThreshold": 20
   },
   "m_displayName": "TOFU - Dungeon - Terminer 20 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/261.json b/data/json/SubAchievementDefinition/261.json
index 5d799e4703b695f3e9b137678c788c581b9da3b0..d50bd4afdea51fae948729d7ef02f098831a6804 100644
--- a/data/json/SubAchievementDefinition/261.json
+++ b/data/json/SubAchievementDefinition/261.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 261,
-    "parentDataId": 531,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 531
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - HUB - 15 Tuer un Cochon possédant 5 auras",
diff --git a/data/json/SubAchievementDefinition/27.json b/data/json/SubAchievementDefinition/27.json
index acc705632c922c84f9b686b57020229eac75e8fc..6af3f0ebe61ad7736c0c595d64285b7c871ed513 100644
--- a/data/json/SubAchievementDefinition/27.json
+++ b/data/json/SubAchievementDefinition/27.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 27,
-    "parentDataId": 611,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 611
+    },
     "completionThreshold": 250
   },
   "m_displayName": "TOFU - Hub - Vaincre 250 Tofus",
diff --git a/data/json/SubAchievementDefinition/270.json b/data/json/SubAchievementDefinition/270.json
index 971f35ff5fad18db34e57a8543930515c869d3b7..f7147bf5363eb73ac74918cc0069920e74d2ffb5 100644
--- a/data/json/SubAchievementDefinition/270.json
+++ b/data/json/SubAchievementDefinition/270.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 270,
-    "parentDataId": 2177,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2177
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/273.json b/data/json/SubAchievementDefinition/273.json
index 644954d6c2cdc1d9a26b0d4c1a6eb1921b70e0af..c28042c003e7a6a5b39dbf441a922dbf46ba4827 100644
--- a/data/json/SubAchievementDefinition/273.json
+++ b/data/json/SubAchievementDefinition/273.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 273,
-    "parentDataId": 794,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 794
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 19 Vaincre la Forteresse Royale en première",
diff --git a/data/json/SubAchievementDefinition/276.json b/data/json/SubAchievementDefinition/276.json
index 9fbd44d385910791a4cf0bbccbe9069afd3e064e..cfae5a5bed1841d18ab6d3120eb63b3fd91c3f23 100644
--- a/data/json/SubAchievementDefinition/276.json
+++ b/data/json/SubAchievementDefinition/276.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 276,
-    "parentDataId": 565,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 565
+    },
     "completionThreshold": 10
   },
   "m_displayName": "COCHON - Q01 - OR - Achever 10 Porigamis en dernier",
diff --git a/data/json/SubAchievementDefinition/277.json b/data/json/SubAchievementDefinition/277.json
index 3cd717aa8f3e885bc8bddc2d265182a6b897f152..83b763416917819b5d4fbdf08c1221a1f5e9a478 100644
--- a/data/json/SubAchievementDefinition/277.json
+++ b/data/json/SubAchievementDefinition/277.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 277,
-    "parentDataId": 690,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 690
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Vaincre le boss 3",
diff --git a/data/json/SubAchievementDefinition/278.json b/data/json/SubAchievementDefinition/278.json
index 60e363c8d888fe07dc5a6447baba56c5dc795f5e..6f0afe2e857a65b9e2bb5528f49b6f88cbc7ef72 100644
--- a/data/json/SubAchievementDefinition/278.json
+++ b/data/json/SubAchievementDefinition/278.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 278,
-    "parentDataId": 697,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 697
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - WIP 3",
diff --git a/data/json/SubAchievementDefinition/279.json b/data/json/SubAchievementDefinition/279.json
index 182e5979619e3ed68c6f72d85903ee7698d11f3d..08e315f62e6e95956e44f02230af1393981178b6 100644
--- a/data/json/SubAchievementDefinition/279.json
+++ b/data/json/SubAchievementDefinition/279.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 279,
-    "parentDataId": 966,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 966
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - BRONZE - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/28.json b/data/json/SubAchievementDefinition/28.json
index 41e6b05b7ba40856ebdb3d1b25a1cbc60180799f..763cb82b50b2eb4be6723313dce85733372f1026 100644
--- a/data/json/SubAchievementDefinition/28.json
+++ b/data/json/SubAchievementDefinition/28.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 28,
-    "parentDataId": 646,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 646
+    },
     "completionThreshold": 100
   },
   "m_displayName": "CHUCHOTEUR - HUB - 05 Remporter 100 combats",
diff --git a/data/json/SubAchievementDefinition/281.json b/data/json/SubAchievementDefinition/281.json
index 20c2a9b8465bc3db366c0ab834d638544827b124..ac9eb593b51a7e0a9f89c2f1f0f5add80ce27029 100644
--- a/data/json/SubAchievementDefinition/281.json
+++ b/data/json/SubAchievementDefinition/281.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 281,
-    "parentDataId": 452,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 452
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Subir 12 attaques physiques ou plus en un seul tour",
diff --git a/data/json/SubAchievementDefinition/282.json b/data/json/SubAchievementDefinition/282.json
index 02e2c8315487902b5de830e741ff19544af4f2a8..ba4a47349cf5f72156cc5c065f92a0667d5c3fdc 100644
--- a/data/json/SubAchievementDefinition/282.json
+++ b/data/json/SubAchievementDefinition/282.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 282,
-    "parentDataId": 693,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 693
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TOFU - Hub - Réduire la taille d\u0027une Horde 50 fois",
diff --git a/data/json/SubAchievementDefinition/284.json b/data/json/SubAchievementDefinition/284.json
index d686d4998f1ec15956b644f848a75a61f9c234e7..47728eb7d15eee8a2f4dd9e72a1aeedb5a6870d9 100644
--- a/data/json/SubAchievementDefinition/284.json
+++ b/data/json/SubAchievementDefinition/284.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 284,
-    "parentDataId": 344,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 344
+    },
     "completionThreshold": 15
   },
   "m_displayName": "CHAFER - Hub - Détruire 15 Ossuaires Funestes",
diff --git a/data/json/SubAchievementDefinition/287.json b/data/json/SubAchievementDefinition/287.json
index 7b7a8874a8b5ba6a48ece5e12c9a187b98e391b5..ce1dd0c8a3e4b19d834d51bbe4a0b523129d5b72 100644
--- a/data/json/SubAchievementDefinition/287.json
+++ b/data/json/SubAchievementDefinition/287.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 287,
-    "parentDataId": 676,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 676
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - Vaincre un gardien Pira\u0027Bwork sans invoquer de compagnons",
diff --git a/data/json/SubAchievementDefinition/288.json b/data/json/SubAchievementDefinition/288.json
index b6717b9a03229befbc74d0b96fbcb0abaabfb75b..688fe52bdce4b9341172820d65c22c4280cf9042 100644
--- a/data/json/SubAchievementDefinition/288.json
+++ b/data/json/SubAchievementDefinition/288.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 288,
-    "parentDataId": 567,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 567
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 02 Chapitre II",
diff --git a/data/json/SubAchievementDefinition/289.json b/data/json/SubAchievementDefinition/289.json
index d49b8ad8836740dbc490cf21a4453a372d4b9cd0..3418f7432e34bb7a4f25f6580ac79779f030e3aa 100644
--- a/data/json/SubAchievementDefinition/289.json
+++ b/data/json/SubAchievementDefinition/289.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 289,
-    "parentDataId": 968,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 968
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Retrouver Boufquette et la reperdre aussitôt",
diff --git a/data/json/SubAchievementDefinition/2894.json b/data/json/SubAchievementDefinition/2894.json
index b576f5430b5ae3f8b15b44a6180bff6d07d86f1a..033e761eee3a31717e4ba0b57fef45842f7c9681 100644
--- a/data/json/SubAchievementDefinition/2894.json
+++ b/data/json/SubAchievementDefinition/2894.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 2894,
-    "parentDataId": 1662,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 1662
+    },
     "completionThreshold": 30
   },
   "m_displayName": "CHUCHOTEUR - HUB - 09 Tuer 30 Chuchoteurs en Posture Offensive",
diff --git a/data/json/SubAchievementDefinition/2896.json b/data/json/SubAchievementDefinition/2896.json
index 72b7b94b69c2fe443ee2f3e429907280431bfeef..290192eb7f609af160f61ba006c2e31fafa0ca16 100644
--- a/data/json/SubAchievementDefinition/2896.json
+++ b/data/json/SubAchievementDefinition/2896.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 2896,
-    "parentDataId": 303,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 303
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - [TODO] 15",
diff --git a/data/json/SubAchievementDefinition/29.json b/data/json/SubAchievementDefinition/29.json
index af83eff6bd92ac7d9af41d87c6c84232614c8dae..366e35cbbd3b4e363391d63c48af9ea6a4316098 100644
--- a/data/json/SubAchievementDefinition/29.json
+++ b/data/json/SubAchievementDefinition/29.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 29,
-    "parentDataId": 111,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 111
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 01 Chapitre I",
diff --git a/data/json/SubAchievementDefinition/291.json b/data/json/SubAchievementDefinition/291.json
index ecaa1c14ecddab44a039c02211e26f3b08db3f84..d5c3b2a515e75513443082dd61cd15d5b032c095 100644
--- a/data/json/SubAchievementDefinition/291.json
+++ b/data/json/SubAchievementDefinition/291.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 291,
-    "parentDataId": 606,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 606
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - [TODO] 25",
diff --git a/data/json/SubAchievementDefinition/293.json b/data/json/SubAchievementDefinition/293.json
index a7663818f9930c0dfd97e82bf416c0f4621656d0..adf6179899424f1a8f68007c31d0c7e46310efe1 100644
--- a/data/json/SubAchievementDefinition/293.json
+++ b/data/json/SubAchievementDefinition/293.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 293,
-    "parentDataId": 121,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 121
+    },
     "completionThreshold": 500
   },
   "m_displayName": "CHUCHOTEUR - HUB - 03 Vaincre 500 Chucho",
diff --git a/data/json/SubAchievementDefinition/298.json b/data/json/SubAchievementDefinition/298.json
index f622bc3e49d52a09807cd82e960977010d7445d2..9a400fd6dfcfbf5372f04361edd7beb25f89e6b4 100644
--- a/data/json/SubAchievementDefinition/298.json
+++ b/data/json/SubAchievementDefinition/298.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 298,
-    "parentDataId": 815,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 815
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - Affronter un Gro Bwork sans qu\u0027il ne touche un seul allié",
diff --git a/data/json/SubAchievementDefinition/299.json b/data/json/SubAchievementDefinition/299.json
index edf58c07f2fbb68579f1f61feb8aed405e76a2ac..cf848814c312531fee98a43ba38d0ef6c8b3a97b 100644
--- a/data/json/SubAchievementDefinition/299.json
+++ b/data/json/SubAchievementDefinition/299.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 299,
-    "parentDataId": 620,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 620
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - ARGENT - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/3.json b/data/json/SubAchievementDefinition/3.json
index e02c7d5d714ee0d64f7317067ca3dfc08476e0f7..f51ea7648defd92ae62c76f14463059bd8de4271 100644
--- a/data/json/SubAchievementDefinition/3.json
+++ b/data/json/SubAchievementDefinition/3.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 3,
-    "parentDataId": 1555,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 1555
+    },
     "completionThreshold": 100
   },
   "m_displayName": "COCHON - HUB - 01 Vaincre 100 Cochons",
diff --git a/data/json/SubAchievementDefinition/30.json b/data/json/SubAchievementDefinition/30.json
index bba8b2556eb81ade90960594e50fcbec0c1d24e1..c17ba4276a1056bb05a5d145359e131c79fa4193 100644
--- a/data/json/SubAchievementDefinition/30.json
+++ b/data/json/SubAchievementDefinition/30.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 30,
-    "parentDataId": 858,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 858
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - 11 Achever une Mortadella en dernier",
diff --git a/data/json/SubAchievementDefinition/302.json b/data/json/SubAchievementDefinition/302.json
index 97d8a5ba86d3523ba0157b0b07b538a570458946..d8f9a998a3185c0cc02ed8ebbf0fff18de9f4be2 100644
--- a/data/json/SubAchievementDefinition/302.json
+++ b/data/json/SubAchievementDefinition/302.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 302,
-    "parentDataId": 826,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 826
+    },
     "completionThreshold": 10
   },
   "m_displayName": "TAURE - Dungeon - Terminer 10 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/307.json b/data/json/SubAchievementDefinition/307.json
index 57804ab6144046e9e57c835b14e1b22d456fcb68..9d98f06a5edab587d669c4435cf522c723a66c50 100644
--- a/data/json/SubAchievementDefinition/307.json
+++ b/data/json/SubAchievementDefinition/307.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 307,
-    "parentDataId": 938,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 938
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - BRONZE - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/308.json b/data/json/SubAchievementDefinition/308.json
index cac1668421ce2e841043f20909d0f5ec60ec426a..313d2197b921e1bf7357518133139d1e138f7251 100644
--- a/data/json/SubAchievementDefinition/308.json
+++ b/data/json/SubAchievementDefinition/308.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 308,
-    "parentDataId": 191,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 191
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/31.json b/data/json/SubAchievementDefinition/31.json
index 8a94fe9a01be94e00c0cb669105983ab5e209179..f1810470f3390a2c943e8ad1032c557d1578c6e5 100644
--- a/data/json/SubAchievementDefinition/31.json
+++ b/data/json/SubAchievementDefinition/31.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 31,
-    "parentDataId": 385,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 385
+    },
     "completionThreshold": 30
   },
   "m_displayName": "BOUFTOU - Q03 - Avoir vaincu 30 sbires du clan 1",
diff --git a/data/json/SubAchievementDefinition/312.json b/data/json/SubAchievementDefinition/312.json
index bc56e7d07d6ddb4feaadc72747c118b303764278..47e0d8ebb2b34218040e66695ff945c636fc81b6 100644
--- a/data/json/SubAchievementDefinition/312.json
+++ b/data/json/SubAchievementDefinition/312.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 312,
-    "parentDataId": 732,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 732
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/315.json b/data/json/SubAchievementDefinition/315.json
index 84b884c54b80789a125d577b28ca7535cc98467f..f27aadb56d48a5301a682cecef8cd15017ef4484 100644
--- a/data/json/SubAchievementDefinition/315.json
+++ b/data/json/SubAchievementDefinition/315.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 315,
-    "parentDataId": 12,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 12
+    },
     "completionThreshold": 20
   },
   "m_displayName": "COCHON - HUB - 06 Détruire 20 Kitsu d\u0027Entraînement",
diff --git a/data/json/SubAchievementDefinition/316.json b/data/json/SubAchievementDefinition/316.json
index 221a4ffa9cea9cf5186aa5d511519af257c30504..c82bb8debd0196471e82ccb727ab51de080785fc 100644
--- a/data/json/SubAchievementDefinition/316.json
+++ b/data/json/SubAchievementDefinition/316.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 316,
-    "parentDataId": 115,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 115
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - IV",
diff --git a/data/json/SubAchievementDefinition/32.json b/data/json/SubAchievementDefinition/32.json
index 2c60cf548b30e4fb60691c78a72bd69ca4cac9f2..ce35ce059af4adbb19632addb30b5b8e1a61abde 100644
--- a/data/json/SubAchievementDefinition/32.json
+++ b/data/json/SubAchievementDefinition/32.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 32,
-    "parentDataId": 716,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 716
+    },
     "completionThreshold": 5
   },
   "m_displayName": "CHAFER - Q01 - Achever 5 Proctoss en premier",
diff --git a/data/json/SubAchievementDefinition/320.json b/data/json/SubAchievementDefinition/320.json
index 0b456888f1d011f433b119da30b02113dae66cf7..99b23bdbdb6b829628998f468727daf40097af4f 100644
--- a/data/json/SubAchievementDefinition/320.json
+++ b/data/json/SubAchievementDefinition/320.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 320,
-    "parentDataId": 127,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 127
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Vaincre 3 DEGENERESCENCES dans le même combat",
diff --git a/data/json/SubAchievementDefinition/322.json b/data/json/SubAchievementDefinition/322.json
index 79e1774a3e2289460f67a9095a0fa871735a0e41..526cb9b89128cb044fb51025c3b32872dbbc573d 100644
--- a/data/json/SubAchievementDefinition/322.json
+++ b/data/json/SubAchievementDefinition/322.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 322,
-    "parentDataId": 602,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 602
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/323.json b/data/json/SubAchievementDefinition/323.json
index 2a4c6df70022a6b118e6fac46d8ea87ca78655cf..e5ed9670cdf84e43b35ecb6dd2c2fb3b822814d5 100644
--- a/data/json/SubAchievementDefinition/323.json
+++ b/data/json/SubAchievementDefinition/323.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 323,
-    "parentDataId": 388,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 388
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/324.json b/data/json/SubAchievementDefinition/324.json
index 6a18bc77e56c43060b5dfdd0ed946909ac904a9c..3d24db996348af0e55734760524b6d7f583e7d04 100644
--- a/data/json/SubAchievementDefinition/324.json
+++ b/data/json/SubAchievementDefinition/324.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 324,
-    "parentDataId": 22,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 22
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Tuer 10 Kasimordo en un seul combat",
diff --git a/data/json/SubAchievementDefinition/325.json b/data/json/SubAchievementDefinition/325.json
index fc219bbda4990b3218415c2db81a3aa452f85874..e5e6d573f5094c5929971ede470b6786a31bb6a6 100644
--- a/data/json/SubAchievementDefinition/325.json
+++ b/data/json/SubAchievementDefinition/325.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 325,
-    "parentDataId": 955,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 955
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - BRONZE - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/330.json b/data/json/SubAchievementDefinition/330.json
index 8df52b26eead10f459fc5087e20ca77f0c72e0ad..12d064a554ecf698f2e24350164bb3ce87fe0bcb 100644
--- a/data/json/SubAchievementDefinition/330.json
+++ b/data/json/SubAchievementDefinition/330.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 330,
-    "parentDataId": 451,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 451
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/331.json b/data/json/SubAchievementDefinition/331.json
index 681e92efaac9db75517ff493a59f57f314d4bfc9..7afa12a9b55a3b186c8d40b68810a1c6a483e233 100644
--- a/data/json/SubAchievementDefinition/331.json
+++ b/data/json/SubAchievementDefinition/331.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 331,
-    "parentDataId": 334,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 334
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/333.json b/data/json/SubAchievementDefinition/333.json
index 9b4a0609dab370e8ef6395fc307b1450111c8574..1a4629b90fed9a87cdef3292839516b7e24aae02 100644
--- a/data/json/SubAchievementDefinition/333.json
+++ b/data/json/SubAchievementDefinition/333.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 333,
-    "parentDataId": 312,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 312
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - OR - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/334.json b/data/json/SubAchievementDefinition/334.json
index 25aacba65d6bd5215144d08e3e630e96f8c7b91d..bc437f71831ef58bcef81243f7a3351985d4bdf7 100644
--- a/data/json/SubAchievementDefinition/334.json
+++ b/data/json/SubAchievementDefinition/334.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 334,
-    "parentDataId": 513,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 513
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 05 Chapitre V",
diff --git a/data/json/SubAchievementDefinition/3373.json b/data/json/SubAchievementDefinition/3373.json
index 6051c6b688589f096873d879d62c1099bedae729..f31ee247e994f7588e3aaa01d8e2c62d45212829 100644
--- a/data/json/SubAchievementDefinition/3373.json
+++ b/data/json/SubAchievementDefinition/3373.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 3373,
-    "parentDataId": 649,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 649
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Achever un Tofu Ventripotent qui a vu au moins 10 tofus s\u0027envoler",
diff --git a/data/json/SubAchievementDefinition/339.json b/data/json/SubAchievementDefinition/339.json
index 2adf80f2f51cbf57efefdc69f99396f9332c783a..f5459a3c8eae656ad7ceb94d9933897b7d9df78c 100644
--- a/data/json/SubAchievementDefinition/339.json
+++ b/data/json/SubAchievementDefinition/339.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 339,
-    "parentDataId": 969,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 969
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - S\u0027enlever l\u0027état PARASITÉ",
diff --git a/data/json/SubAchievementDefinition/341.json b/data/json/SubAchievementDefinition/341.json
index 223a7a4311e6511f921f25167c6c39dad97b5ec0..c2d86c6c962ed51743c0dfd641c53e174b33163e 100644
--- a/data/json/SubAchievementDefinition/341.json
+++ b/data/json/SubAchievementDefinition/341.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 341,
-    "parentDataId": 574,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 574
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/345.json b/data/json/SubAchievementDefinition/345.json
index ca7ce252e69fe12a3971777bdd5f9fc4865eafc2..f34642fb43b0ab5fcbb692014004537db6de6701 100644
--- a/data/json/SubAchievementDefinition/345.json
+++ b/data/json/SubAchievementDefinition/345.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 345,
-    "parentDataId": 241,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 241
+    },
     "completionThreshold": 100
   },
   "m_displayName": "CHUCHOTEUR - HUB - 01 Vaincre 100 Chucho",
diff --git a/data/json/SubAchievementDefinition/347.json b/data/json/SubAchievementDefinition/347.json
index b50e942855c5fbd1352cfd7cb67dcdbee8fdb71d..d745ce7101aa4c98c68d1e23f50fabf0c586a460 100644
--- a/data/json/SubAchievementDefinition/347.json
+++ b/data/json/SubAchievementDefinition/347.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 347,
-    "parentDataId": 891,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 891
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Terminer le donjon en ne ratant aucun challenge ",
diff --git a/data/json/SubAchievementDefinition/351.json b/data/json/SubAchievementDefinition/351.json
index 4e2b93293adb1c3f575ff69fb670bf04cfcfd61c..d7e0dfb4a2e7f952c1031b7d9b34871079da119d 100644
--- a/data/json/SubAchievementDefinition/351.json
+++ b/data/json/SubAchievementDefinition/351.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 351,
-    "parentDataId": 140,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 140
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/353.json b/data/json/SubAchievementDefinition/353.json
index eae6c75d1780985036ef5126e2bc4b95add46880..4f06e856a9b440c1b4e466819203b13d8b630023 100644
--- a/data/json/SubAchievementDefinition/353.json
+++ b/data/json/SubAchievementDefinition/353.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 353,
-    "parentDataId": 482,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 482
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - BRONZE - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/354.json b/data/json/SubAchievementDefinition/354.json
index b792648d9b249224342d9682c596e5865c5cc9e1..6cd075b9d3b8ad3eb38123516d7ba251e1086513 100644
--- a/data/json/SubAchievementDefinition/354.json
+++ b/data/json/SubAchievementDefinition/354.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 354,
-    "parentDataId": 759,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 759
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 18 Aider Cochonnette à prendre la fuite",
diff --git a/data/json/SubAchievementDefinition/360.json b/data/json/SubAchievementDefinition/360.json
index daf55bd09282992a58e01729bfa84097966fde2f..8033a0263719a61c4f551041fe35b8e80a89f4a4 100644
--- a/data/json/SubAchievementDefinition/360.json
+++ b/data/json/SubAchievementDefinition/360.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 360,
-    "parentDataId": 748,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 748
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - ARGENT - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/361.json b/data/json/SubAchievementDefinition/361.json
index 87dc70ad8e5e84fbdbb5e7dc1b045f59517c3059..8779370a45e8ae47a2d37c934a3d985653c5c6be 100644
--- a/data/json/SubAchievementDefinition/361.json
+++ b/data/json/SubAchievementDefinition/361.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 361,
-    "parentDataId": 123,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 123
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Laisser Roméro achever le Pinspoteur",
diff --git a/data/json/SubAchievementDefinition/362.json b/data/json/SubAchievementDefinition/362.json
index 55ee96c28830287e9b65325cecd3ba1eebe3a9e8..49d0be1faa01dbb3c32c8444dea8d8ab39d09d1d 100644
--- a/data/json/SubAchievementDefinition/362.json
+++ b/data/json/SubAchievementDefinition/362.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 362,
-    "parentDataId": 635,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 635
+    },
     "completionThreshold": 15
   },
   "m_displayName": "CHAFER - Hub - Subir 15 traits de rancune",
diff --git a/data/json/SubAchievementDefinition/363.json b/data/json/SubAchievementDefinition/363.json
index b8d5ea359ddf4e482318a1a3059ac617058fd3aa..58554cf490f4758517449db411d0b91d96c069b8 100644
--- a/data/json/SubAchievementDefinition/363.json
+++ b/data/json/SubAchievementDefinition/363.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 363,
-    "parentDataId": 507,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 507
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - BRONZE - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/366.json b/data/json/SubAchievementDefinition/366.json
index 919d102edb096cfef0528fe363ceb1a324397af2..95bcbd71d5c5711967b6e28c72620fe9e4cd0be0 100644
--- a/data/json/SubAchievementDefinition/366.json
+++ b/data/json/SubAchievementDefinition/366.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 366,
-    "parentDataId": 648,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 648
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 04 Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/3667.json b/data/json/SubAchievementDefinition/3667.json
index b1490b7ac9877f5c3ec9fddcd88fe319ef372904..a61fbf40b11581bac19230df2bc52aa212d6ed2f 100644
--- a/data/json/SubAchievementDefinition/3667.json
+++ b/data/json/SubAchievementDefinition/3667.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 3667,
-    "parentDataId": 59,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 59
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/367.json b/data/json/SubAchievementDefinition/367.json
index b4209cd32bf6acb0d7fe5b31d326786b3c39bda2..1013fe3161fb02afbde69d429e8b05ae8bf954e4 100644
--- a/data/json/SubAchievementDefinition/367.json
+++ b/data/json/SubAchievementDefinition/367.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 367,
-    "parentDataId": 109,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 109
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Aider le Dr. Teigne dans ses expériences",
diff --git a/data/json/SubAchievementDefinition/369.json b/data/json/SubAchievementDefinition/369.json
index 7865801b1d6a082afcc08c88e40438ca84496426..6a4ba96afecd310b6b98dfcbcd26a55b5fe09abf 100644
--- a/data/json/SubAchievementDefinition/369.json
+++ b/data/json/SubAchievementDefinition/369.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 369,
-    "parentDataId": 350,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 350
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/37.json b/data/json/SubAchievementDefinition/37.json
index b7d9932e2772ebaa8c89726d2053b9b3ee42675b..0521245e1c071d18878ded3cf9607d270b3db8e1 100644
--- a/data/json/SubAchievementDefinition/37.json
+++ b/data/json/SubAchievementDefinition/37.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 37,
-    "parentDataId": 215,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 215
+    },
     "completionThreshold": 30
   },
   "m_displayName": "BWORK - Q03 - Vaincre 30 Pira\u0027Bwork",
diff --git a/data/json/SubAchievementDefinition/370.json b/data/json/SubAchievementDefinition/370.json
index 4a6d5085a891726dcaf2ba73b98e2bf45486ca97..23bf1427aea62cc708e6003a450877524679cd85 100644
--- a/data/json/SubAchievementDefinition/370.json
+++ b/data/json/SubAchievementDefinition/370.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 370,
-    "parentDataId": 298,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 298
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Achievement 3",
diff --git a/data/json/SubAchievementDefinition/371.json b/data/json/SubAchievementDefinition/371.json
index 2b9f7dffed310a3d50c025a6b9b3582f8c8b28d6..2def77dc2c2695020a3f0490113425d667871f90 100644
--- a/data/json/SubAchievementDefinition/371.json
+++ b/data/json/SubAchievementDefinition/371.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 371,
-    "parentDataId": 212,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 212
+    },
     "completionThreshold": 30
   },
   "m_displayName": "CHUCHOTEUR - Q01 - 12 Tuer 30 Bataillons Chuchoteurs",
diff --git a/data/json/SubAchievementDefinition/374.json b/data/json/SubAchievementDefinition/374.json
index 65a8d73fb176781f030789c564a125c96cbf7a71..dd43cf3617c1b0ae292276921100edb2e0a4c8fc 100644
--- a/data/json/SubAchievementDefinition/374.json
+++ b/data/json/SubAchievementDefinition/374.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 374,
-    "parentDataId": 184,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 184
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BWORK - Hub - Remporter 100 combats",
diff --git a/data/json/SubAchievementDefinition/375.json b/data/json/SubAchievementDefinition/375.json
index b2ca3e16bfbbd35fc800660c67bd91a5069293a0..baab70279f00a4bf6c402d00b358c056f44c19a0 100644
--- a/data/json/SubAchievementDefinition/375.json
+++ b/data/json/SubAchievementDefinition/375.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 375,
-    "parentDataId": 663,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 663
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/376.json b/data/json/SubAchievementDefinition/376.json
index cf476405cd846a6efdeb3c46d6e39921c97b3bad..5921a2c2c38e6b204efed68857ea895dd18e1a86 100644
--- a/data/json/SubAchievementDefinition/376.json
+++ b/data/json/SubAchievementDefinition/376.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 376,
-    "parentDataId": 239,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 239
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Aider tous les personnages au chapitre 10 en une seule fois",
diff --git a/data/json/SubAchievementDefinition/377.json b/data/json/SubAchievementDefinition/377.json
index 9d0850ee59464eff91a4bae5693ffcd3b2afb59c..36cd39b20d2fcb24be4d56162fabb1a41ff26dc2 100644
--- a/data/json/SubAchievementDefinition/377.json
+++ b/data/json/SubAchievementDefinition/377.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 377,
-    "parentDataId": 798,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 798
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - VIII",
diff --git a/data/json/SubAchievementDefinition/38.json b/data/json/SubAchievementDefinition/38.json
index 73d0561ab1ef9bdc376a0124d48844e5a0f6e9b4..9342b8d21ebe4611f448d1e0d871d6187192adaa 100644
--- a/data/json/SubAchievementDefinition/38.json
+++ b/data/json/SubAchievementDefinition/38.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 38,
-    "parentDataId": 343,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 343
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - ARGENT - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/381.json b/data/json/SubAchievementDefinition/381.json
index c8f0c6af29057bf09600f7ce27c6e9a1a2b8c4a0..7cb77575547885ea4ab8d0c749a5d8bcedb54e0c 100644
--- a/data/json/SubAchievementDefinition/381.json
+++ b/data/json/SubAchievementDefinition/381.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 381,
-    "parentDataId": 512,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 512
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/382.json b/data/json/SubAchievementDefinition/382.json
index 84c498ccb6f5db3716f0759245ec64bad0b10395..9ae0b530cd3d0d47d1cbe8c0f61eba7ce66557d1 100644
--- a/data/json/SubAchievementDefinition/382.json
+++ b/data/json/SubAchievementDefinition/382.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 382,
-    "parentDataId": 960,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 960
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Faire tomber l\u0027AT de votre héros à 0",
diff --git a/data/json/SubAchievementDefinition/387.json b/data/json/SubAchievementDefinition/387.json
index a689d932a493491ca4dbf160a9ee440ab6e5df29..5be2dd3f34b023a27b23d5ebb8cb149d7294bc14 100644
--- a/data/json/SubAchievementDefinition/387.json
+++ b/data/json/SubAchievementDefinition/387.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 387,
-    "parentDataId": 767,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 767
+    },
     "completionThreshold": 5
   },
   "m_displayName": "BWORK - Dungeon - OR - Enrager 5 fois un boss en achevant un autre Bwork",
diff --git a/data/json/SubAchievementDefinition/389.json b/data/json/SubAchievementDefinition/389.json
index 7fc3f571c5369dd5c16cf647037e6bb69b64d457..4efc6f2d4f05aac9a20413dc04dc05a1df409848 100644
--- a/data/json/SubAchievementDefinition/389.json
+++ b/data/json/SubAchievementDefinition/389.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 389,
-    "parentDataId": 686,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 686
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - OR - Terminer un donjon sans activer de mécanisme",
diff --git a/data/json/SubAchievementDefinition/3894.json b/data/json/SubAchievementDefinition/3894.json
index 0e0364a155a0c4549911ca36effbce5102175f3c..120c1118947c994cb63026796fad0557cbf9b2e2 100644
--- a/data/json/SubAchievementDefinition/3894.json
+++ b/data/json/SubAchievementDefinition/3894.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 3894,
-    "parentDataId": 789,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 789
+    },
     "completionThreshold": 10
   },
   "m_displayName": "TOFU - Dungeon - Terminer 10 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/39.json b/data/json/SubAchievementDefinition/39.json
index e54a889ba189bac0303dafda2b5e3d23f2f2c110..f54104c022b95a9f5cec3a18a857991624d2d3db 100644
--- a/data/json/SubAchievementDefinition/39.json
+++ b/data/json/SubAchievementDefinition/39.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 39,
-    "parentDataId": 769,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 769
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/390.json b/data/json/SubAchievementDefinition/390.json
index bf4d88d1eed91684df3f550283217d56f24b49e1..8d49c1db39f9982dbe7061347ed40c9db7be881d 100644
--- a/data/json/SubAchievementDefinition/390.json
+++ b/data/json/SubAchievementDefinition/390.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 390,
-    "parentDataId": 941,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 941
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - BRONZE - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/393.json b/data/json/SubAchievementDefinition/393.json
index 18d065a819c8cf53cd2c5c491afd920eaea7492b..d399fede104aea4a3bbdc90a55949d76b19bdd65 100644
--- a/data/json/SubAchievementDefinition/393.json
+++ b/data/json/SubAchievementDefinition/393.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 393,
-    "parentDataId": 928,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 928
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - ARGENT - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/394.json b/data/json/SubAchievementDefinition/394.json
index 67764fbfb8322ffe2ccb301ce8cc1f8e6f78b407..bb19dcb494eb3d60a0f1c75681b6c2be7d45d1c1 100644
--- a/data/json/SubAchievementDefinition/394.json
+++ b/data/json/SubAchievementDefinition/394.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 394,
-    "parentDataId": 396,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 396
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 5",
diff --git a/data/json/SubAchievementDefinition/395.json b/data/json/SubAchievementDefinition/395.json
index e6bdbbba842de504dc9ec7441593f9ee13cb7820..c617bd642170f724cf4012121457ae50f3c5fcba 100644
--- a/data/json/SubAchievementDefinition/395.json
+++ b/data/json/SubAchievementDefinition/395.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 395,
-    "parentDataId": 758,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 758
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - [TODO] 13",
diff --git a/data/json/SubAchievementDefinition/396.json b/data/json/SubAchievementDefinition/396.json
index 473112af5879d86e0fa73fd94a516044725cea6a..e1f2210324d19337e10448329f80a47e8a86c002 100644
--- a/data/json/SubAchievementDefinition/396.json
+++ b/data/json/SubAchievementDefinition/396.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 396,
-    "parentDataId": 671,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 671
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Faire un COUP DE GRÂCE avec Alibert",
diff --git a/data/json/SubAchievementDefinition/40.json b/data/json/SubAchievementDefinition/40.json
index f83e2f4ff0deb15b26d270a2da3050bbb63c3128..1dcd8bb636144110200d11134368cac39566048d 100644
--- a/data/json/SubAchievementDefinition/40.json
+++ b/data/json/SubAchievementDefinition/40.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 40,
-    "parentDataId": 876,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 876
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/401.json b/data/json/SubAchievementDefinition/401.json
index 02c069abd8d302a58de50048d8d48235a9583e9d..67cbe6f57a37523538fa6e731c393854ccd44020 100644
--- a/data/json/SubAchievementDefinition/401.json
+++ b/data/json/SubAchievementDefinition/401.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 401,
-    "parentDataId": 957,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 957
+    },
     "completionThreshold": 30
   },
   "m_displayName": "CHAFER - Q03 - Vaincre 30 Surins",
diff --git a/data/json/SubAchievementDefinition/402.json b/data/json/SubAchievementDefinition/402.json
index fb5a31f97882784190d197d76af45cacf33f4730..a4c68e9e1d63885b7cefa9757ba5faa089875471 100644
--- a/data/json/SubAchievementDefinition/402.json
+++ b/data/json/SubAchievementDefinition/402.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 402,
-    "parentDataId": 918,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 918
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/404.json b/data/json/SubAchievementDefinition/404.json
index 883c0f8bcd0480bb73bd1d332038f53d5985afcd..0e8169a0db4adf2cf717ad20a219e668eefb56d2 100644
--- a/data/json/SubAchievementDefinition/404.json
+++ b/data/json/SubAchievementDefinition/404.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 404,
-    "parentDataId": 227,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 227
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/405.json b/data/json/SubAchievementDefinition/405.json
index 1a357f880d97bf43c7dd851c578c78da1c855666..07e5f39f47e3c4f5dc14df76530758704b66bd0c 100644
--- a/data/json/SubAchievementDefinition/405.json
+++ b/data/json/SubAchievementDefinition/405.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 405,
-    "parentDataId": 345,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 345
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Achever 10 adversaires avec Raphl Lalen en une seule traversée",
diff --git a/data/json/SubAchievementDefinition/41.json b/data/json/SubAchievementDefinition/41.json
index ab80f54ae239a087d15129d935129aa12826c106..039fa9bfa2bb0e900b5ac7fc7559bfc29df82cf9 100644
--- a/data/json/SubAchievementDefinition/41.json
+++ b/data/json/SubAchievementDefinition/41.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 41,
-    "parentDataId": 823,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 823
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/412.json b/data/json/SubAchievementDefinition/412.json
index 184a71f6f030ac789b4fb915717bf3871f382a67..15049f5c2bf09e02de44a7aae3875c991dcb10db 100644
--- a/data/json/SubAchievementDefinition/412.json
+++ b/data/json/SubAchievementDefinition/412.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 412,
-    "parentDataId": 432,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 432
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/415.json b/data/json/SubAchievementDefinition/415.json
index f7c50368d3a301e21f116051366e031afd6132f8..a72ce17132ab43b1f93e4c267792dc8f11007e07 100644
--- a/data/json/SubAchievementDefinition/415.json
+++ b/data/json/SubAchievementDefinition/415.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 415,
-    "parentDataId": 439,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 439
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - HUB - 11 Gagner en ayant tué un ennemi ayant atteint au moins 150 d\u0027armure",
diff --git a/data/json/SubAchievementDefinition/416.json b/data/json/SubAchievementDefinition/416.json
index b9fbfd699c81981f67bafae0af83fb8fa91f6817..4c53095abfaa71af166d94cc167d64d7f381ae12 100644
--- a/data/json/SubAchievementDefinition/416.json
+++ b/data/json/SubAchievementDefinition/416.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 416,
-    "parentDataId": 38,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 38
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 15 Run Complète Chap. X",
diff --git a/data/json/SubAchievementDefinition/419.json b/data/json/SubAchievementDefinition/419.json
index 02c4daa77f145d0a065aca213415e370e034bb1b..261111b26afba1a20a4c27a74fde64954d06259c 100644
--- a/data/json/SubAchievementDefinition/419.json
+++ b/data/json/SubAchievementDefinition/419.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 419,
-    "parentDataId": 291,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 291
+    },
     "completionThreshold": 500
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre 500 BOUFTOUS",
diff --git a/data/json/SubAchievementDefinition/425.json b/data/json/SubAchievementDefinition/425.json
index 191d3450ac346c13c8ae0a21b6733dc2ad174fb1..3b819839a2f46be69a79410ba380231f0a5956c7 100644
--- a/data/json/SubAchievementDefinition/425.json
+++ b/data/json/SubAchievementDefinition/425.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 425,
-    "parentDataId": 485,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 485
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Se faire déplacer de 5 cases ou plus",
diff --git a/data/json/SubAchievementDefinition/43.json b/data/json/SubAchievementDefinition/43.json
index dd819bbf5dfffabed72a4e9a68d0b8237ba13a06..8ebcc23d6410eedb05a1c0bd427fd3576d501b8f 100644
--- a/data/json/SubAchievementDefinition/43.json
+++ b/data/json/SubAchievementDefinition/43.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 43,
-    "parentDataId": 533,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 533
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 16 Aider Danny Zepig à p⡰rendre sa revanche",
diff --git a/data/json/SubAchievementDefinition/430.json b/data/json/SubAchievementDefinition/430.json
index b7fd6230febbc75df59ea2947a77466212b2db61..8005f297bed9c64f5d80504fc502615f3f68d81b 100644
--- a/data/json/SubAchievementDefinition/430.json
+++ b/data/json/SubAchievementDefinition/430.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 430,
-    "parentDataId": 32,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 32
+    },
     "completionThreshold": 50
   },
   "m_displayName": "BWORK - Hub - Remporter 50 combats",
diff --git a/data/json/SubAchievementDefinition/433.json b/data/json/SubAchievementDefinition/433.json
index 72d2b7cd12e76122a3ee03ca334715f4de3e48fd..9a0b92b9d701b339b2300a5c9abcebaefb561a8b 100644
--- a/data/json/SubAchievementDefinition/433.json
+++ b/data/json/SubAchievementDefinition/433.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 433,
-    "parentDataId": 453,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 453
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Aider tous les personnages au chapitre 10 en une fois",
diff --git a/data/json/SubAchievementDefinition/434.json b/data/json/SubAchievementDefinition/434.json
index a087bd142747f129ac96caa5209858dabebcc890..be354c3f20c1af13468553df3ef0b0bd04332db3 100644
--- a/data/json/SubAchievementDefinition/434.json
+++ b/data/json/SubAchievementDefinition/434.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 434,
-    "parentDataId": 84,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 84
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 06 Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/440.json b/data/json/SubAchievementDefinition/440.json
index 2545561e53c4c6473683b075342cf63019942ba2..df5c81d140866256c8d49be0ade07154639a8db0 100644
--- a/data/json/SubAchievementDefinition/440.json
+++ b/data/json/SubAchievementDefinition/440.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 440,
-    "parentDataId": 149,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 149
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre 100 BOUFTONS",
diff --git a/data/json/SubAchievementDefinition/442.json b/data/json/SubAchievementDefinition/442.json
index 344ab69338fb49a7da00f15bf7b631f3b1531c4a..d1b574c03ca0a1ef0a121130d43023cb88eeb148 100644
--- a/data/json/SubAchievementDefinition/442.json
+++ b/data/json/SubAchievementDefinition/442.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 442,
-    "parentDataId": 399,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 399
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - OR- Chapitre V",
diff --git a/data/json/SubAchievementDefinition/443.json b/data/json/SubAchievementDefinition/443.json
index 31671293684ba45c691ef3b806b2661004524219..d4fb97d31fcd9a5ad69bc7f73ee92c2ad29b8bfc 100644
--- a/data/json/SubAchievementDefinition/443.json
+++ b/data/json/SubAchievementDefinition/443.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 443,
-    "parentDataId": 781,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 781
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Vaincre Cornan en premier",
diff --git a/data/json/SubAchievementDefinition/455.json b/data/json/SubAchievementDefinition/455.json
index ae26e3e010bfa590043cef49e7ecdbc741debd39..9caccb363c46e47cdf3cb3ea42a4ea35e41f4002 100644
--- a/data/json/SubAchievementDefinition/455.json
+++ b/data/json/SubAchievementDefinition/455.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 455,
-    "parentDataId": 634,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 634
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - ARGENT - Vaincre Jon Kriz en dernier en Argent ou plus",
diff --git a/data/json/SubAchievementDefinition/456.json b/data/json/SubAchievementDefinition/456.json
index d21ea9523119ade5a675c4037a4a2c2f4cfc478a..708985ca80926b3d8c232b0a17a40edd94f2b36c 100644
--- a/data/json/SubAchievementDefinition/456.json
+++ b/data/json/SubAchievementDefinition/456.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 456,
-    "parentDataId": 49,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 49
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/4568.json b/data/json/SubAchievementDefinition/4568.json
index e219a15d0afdd5deb57362cf9b7b507506954cc4..f8818167a062f94a7f9b0cbb75aca66638eea0d8 100644
--- a/data/json/SubAchievementDefinition/4568.json
+++ b/data/json/SubAchievementDefinition/4568.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 4568,
-    "parentDataId": 571,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 571
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TAURE - Hub - Remporter 50 combats",
diff --git a/data/json/SubAchievementDefinition/457.json b/data/json/SubAchievementDefinition/457.json
index a693a8fa98903230d1cbf3741e882a8071f59c5b..7b55f04bb94b6d37b17463402633ff20edb5aa00 100644
--- a/data/json/SubAchievementDefinition/457.json
+++ b/data/json/SubAchievementDefinition/457.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 457,
-    "parentDataId": 54,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 54
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 08 Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/460.json b/data/json/SubAchievementDefinition/460.json
index 3304081234ec63363e3ebe965bf142af2e800d09..0935bd3d7acde775ca14d310da35e917bec05418 100644
--- a/data/json/SubAchievementDefinition/460.json
+++ b/data/json/SubAchievementDefinition/460.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 460,
-    "parentDataId": 55,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 55
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/463.json b/data/json/SubAchievementDefinition/463.json
index f317ecdc62e03d184c3cbf24273d93370b323131..e558a6fbf6ed7c7df2bd13d89a41c15fa3611770 100644
--- a/data/json/SubAchievementDefinition/463.json
+++ b/data/json/SubAchievementDefinition/463.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 463,
-    "parentDataId": 475,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 475
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - OR - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/464.json b/data/json/SubAchievementDefinition/464.json
index 89299eb14e04a6562aff2759578966a5d3ed94d8..31ebf5a2460132a7e9ece0c406598516c6ec484c 100644
--- a/data/json/SubAchievementDefinition/464.json
+++ b/data/json/SubAchievementDefinition/464.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 464,
-    "parentDataId": 598,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 598
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/4704.json b/data/json/SubAchievementDefinition/4704.json
index 073c59983a0b7959026f2da8acc61df3ec5aa80d..192c53f8a4909aef700c437b135e2ea6e4e6affa 100644
--- a/data/json/SubAchievementDefinition/4704.json
+++ b/data/json/SubAchievementDefinition/4704.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 4704,
-    "parentDataId": 2941,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2941
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 1",
diff --git a/data/json/SubAchievementDefinition/471.json b/data/json/SubAchievementDefinition/471.json
index c3fbd73cd2f04456b8a0dd23c2e7ff3b90ee63da..2be0e3cf26a84a8cda56462234f469abb69651f6 100644
--- a/data/json/SubAchievementDefinition/471.json
+++ b/data/json/SubAchievementDefinition/471.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 471,
-    "parentDataId": 360,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 360
+    },
     "completionThreshold": 100
   },
   "m_displayName": "TAURE - Hub - Vaincre 100 Taures",
diff --git a/data/json/SubAchievementDefinition/475.json b/data/json/SubAchievementDefinition/475.json
index 034a12c8052a00abed55ac2033601c42a50374e9..d18229ad8dd1c48c60de6e44a31b22819e9284f4 100644
--- a/data/json/SubAchievementDefinition/475.json
+++ b/data/json/SubAchievementDefinition/475.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 475,
-    "parentDataId": 297,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 297
+    },
     "completionThreshold": 250
   },
   "m_displayName": "TAURE - Hub - Vaincre 250 Taures",
diff --git a/data/json/SubAchievementDefinition/476.json b/data/json/SubAchievementDefinition/476.json
index 74c9552a8a093240ea553c97317084341e027b24..87997732e935d684210ff7dab915681cb398736a 100644
--- a/data/json/SubAchievementDefinition/476.json
+++ b/data/json/SubAchievementDefinition/476.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 476,
-    "parentDataId": 643,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 643
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 10",
diff --git a/data/json/SubAchievementDefinition/48.json b/data/json/SubAchievementDefinition/48.json
index ebcb8d378ff1e83ae44d5b997fd7e0fed05fc8b7..6995a4c7a8b9935452b893a9a52d712f629cab0f 100644
--- a/data/json/SubAchievementDefinition/48.json
+++ b/data/json/SubAchievementDefinition/48.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 48,
-    "parentDataId": 658,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 658
+    },
     "completionThreshold": 30
   },
   "m_displayName": "BWORK - Q03 - Vaincre 30 Volcano\u0027Culte",
diff --git a/data/json/SubAchievementDefinition/483.json b/data/json/SubAchievementDefinition/483.json
index 00ae44851842107196f1a4c10d678767446f9836..c6c4cd74e78adea9d0d49f235acb81108cca704c 100644
--- a/data/json/SubAchievementDefinition/483.json
+++ b/data/json/SubAchievementDefinition/483.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 483,
-    "parentDataId": 466,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 466
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - ARGENT - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/486.json b/data/json/SubAchievementDefinition/486.json
index 6e3940a8a176f5ec86633ca3bd3007ad109c8298..0d9b044b6bfb2eb1dc574fc7692fe955ae06e7eb 100644
--- a/data/json/SubAchievementDefinition/486.json
+++ b/data/json/SubAchievementDefinition/486.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 486,
-    "parentDataId": 689,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 689
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - OR - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/488.json b/data/json/SubAchievementDefinition/488.json
index e374d175d428ec08948cf2e937bc11fd0a3bfda1..73c537ca1d6aa057b76ace10f9df5c9ce60f7025 100644
--- a/data/json/SubAchievementDefinition/488.json
+++ b/data/json/SubAchievementDefinition/488.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 488,
-    "parentDataId": 153,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 153
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - WIP 1",
diff --git a/data/json/SubAchievementDefinition/492.json b/data/json/SubAchievementDefinition/492.json
index 57b8f7823465a099f362b2fa1023e1510b916a1a..d9ba05b7a2e2facd90df273e6de07252d1ab8e0e 100644
--- a/data/json/SubAchievementDefinition/492.json
+++ b/data/json/SubAchievementDefinition/492.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 492,
-    "parentDataId": 2596,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2596
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - WIP 4",
diff --git a/data/json/SubAchievementDefinition/495.json b/data/json/SubAchievementDefinition/495.json
index 06288f0239a42c91e8d80677d06b231c5caa7f8f..44c6b6bb1a1d53c8dff25b2c76cc835befef487d 100644
--- a/data/json/SubAchievementDefinition/495.json
+++ b/data/json/SubAchievementDefinition/495.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 495,
-    "parentDataId": 824,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 824
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - WIP 5",
diff --git a/data/json/SubAchievementDefinition/499.json b/data/json/SubAchievementDefinition/499.json
index 9f9a57584d64988a1bd258b9d9a2fe1f9d92fe60..2318ffb371f0112765f8cba5662a4e747af9893b 100644
--- a/data/json/SubAchievementDefinition/499.json
+++ b/data/json/SubAchievementDefinition/499.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 499,
-    "parentDataId": 838,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 838
+    },
     "completionThreshold": 20
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 11 Réussir 20 Challenges",
diff --git a/data/json/SubAchievementDefinition/501.json b/data/json/SubAchievementDefinition/501.json
index ec664753e67a08480ef3feccd65ac230942d861d..d4aef44ff2dc33e2113aa858276e3b68ee9fedf6 100644
--- a/data/json/SubAchievementDefinition/501.json
+++ b/data/json/SubAchievementDefinition/501.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 501,
-    "parentDataId": 530,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 530
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - WIP 3",
diff --git a/data/json/SubAchievementDefinition/504.json b/data/json/SubAchievementDefinition/504.json
index 5b8d61aa21463191267b4f1ff5d7dc377e72e6c4..2015887947d68ff7755b997ef6350c1412a9d121 100644
--- a/data/json/SubAchievementDefinition/504.json
+++ b/data/json/SubAchievementDefinition/504.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 504,
-    "parentDataId": 861,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 861
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 8",
diff --git a/data/json/SubAchievementDefinition/505.json b/data/json/SubAchievementDefinition/505.json
index bfc04eb80f6926c871e13beafef8383aef659870..c2cbe0c3d275347a9f7a38125a6c14e2d5d87cd2 100644
--- a/data/json/SubAchievementDefinition/505.json
+++ b/data/json/SubAchievementDefinition/505.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 505,
-    "parentDataId": 280,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 280
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/508.json b/data/json/SubAchievementDefinition/508.json
index cae28c5d8ea54752358aea2c99f5f9bcac646eb4..ceaf2f1b7b79add13d5ede54d5f1deeaf4738cdf 100644
--- a/data/json/SubAchievementDefinition/508.json
+++ b/data/json/SubAchievementDefinition/508.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 508,
-    "parentDataId": 792,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 792
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - 14 Tuer des Conjurateurs en dernier",
diff --git a/data/json/SubAchievementDefinition/509.json b/data/json/SubAchievementDefinition/509.json
index 33c94aa01f5890331c14ab59a2ee4ed1f16ac80d..9c15f41fbd08a67b47399bf0c4aeeb4e42bd7d91 100644
--- a/data/json/SubAchievementDefinition/509.json
+++ b/data/json/SubAchievementDefinition/509.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 509,
-    "parentDataId": 351,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 351
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - DONJON - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/51.json b/data/json/SubAchievementDefinition/51.json
index 265fe5278c8cf2043bfaa62a54dbd68233ffa86d..562eb9a8b2066f13c80a4b0bcbf442422548725b 100644
--- a/data/json/SubAchievementDefinition/51.json
+++ b/data/json/SubAchievementDefinition/51.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 51,
-    "parentDataId": 681,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 681
+    },
     "completionThreshold": 50
   },
   "m_displayName": "CHAFER - Dungeon - Challenge II",
diff --git a/data/json/SubAchievementDefinition/510.json b/data/json/SubAchievementDefinition/510.json
index fae66af3965f6235558b723aedb82c89a16c5f8d..d795711f3f8fbb552302118aeafaf52e78d9142c 100644
--- a/data/json/SubAchievementDefinition/510.json
+++ b/data/json/SubAchievementDefinition/510.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 510,
-    "parentDataId": 447,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 447
+    },
     "completionThreshold": 50
   },
   "m_displayName": "COCHON - HUB - 08 Subir 50 sorts nauséabonds",
diff --git a/data/json/SubAchievementDefinition/511.json b/data/json/SubAchievementDefinition/511.json
index 57cf8978ee3aa16ae6dfa1addae6bdf7cbd6b345..5516b0708805e816506128f8cd9209e7f6fd804a 100644
--- a/data/json/SubAchievementDefinition/511.json
+++ b/data/json/SubAchievementDefinition/511.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 511,
-    "parentDataId": 362,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 362
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - VII",
diff --git a/data/json/SubAchievementDefinition/5123.json b/data/json/SubAchievementDefinition/5123.json
index e4ccb181e842d0f74a4c8b00fc613d9637c58dac..d4e635363d25feb5e3d8ea93e51022287733a85d 100644
--- a/data/json/SubAchievementDefinition/5123.json
+++ b/data/json/SubAchievementDefinition/5123.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 5123,
-    "parentDataId": 586,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 586
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/514.json b/data/json/SubAchievementDefinition/514.json
index 7f1bc0dc6a8bf5a148e4b7b049eeefdfb8601621..4feba1d442d45202d66834874912773b21354176 100644
--- a/data/json/SubAchievementDefinition/514.json
+++ b/data/json/SubAchievementDefinition/514.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 514,
-    "parentDataId": 770,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 770
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/5142.json b/data/json/SubAchievementDefinition/5142.json
index 59a21abb39e92921c73945804544fec35da21150..097ed7defa81a141716a451afe74037eda202809 100644
--- a/data/json/SubAchievementDefinition/5142.json
+++ b/data/json/SubAchievementDefinition/5142.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 5142,
-    "parentDataId": 907,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 907
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/515.json b/data/json/SubAchievementDefinition/515.json
index 5b814843a9dcee9fa0c626b11bc03b5177283bcd..7933ec0e61572d29f2bb725e41f156474c0f1fd9 100644
--- a/data/json/SubAchievementDefinition/515.json
+++ b/data/json/SubAchievementDefinition/515.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 515,
-    "parentDataId": 128,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 128
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 3",
diff --git a/data/json/SubAchievementDefinition/517.json b/data/json/SubAchievementDefinition/517.json
index ce6717cc3c4c907ddf68a32e7e0edf6ae3974c96..ad38064e895a9dedf312197b80a00a326f44bf41 100644
--- a/data/json/SubAchievementDefinition/517.json
+++ b/data/json/SubAchievementDefinition/517.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 517,
-    "parentDataId": 634,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 634
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - ARGENT - Vaincre Périgourdin en dernier en Argent ou plus",
diff --git a/data/json/SubAchievementDefinition/518.json b/data/json/SubAchievementDefinition/518.json
index 80513de23063f76d68af1cc2ec5f406c7bd8d9dc..e867f311104bc180b2eb0530b1eac2d1dbe372fb 100644
--- a/data/json/SubAchievementDefinition/518.json
+++ b/data/json/SubAchievementDefinition/518.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 518,
-    "parentDataId": 48,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 48
+    },
     "completionThreshold": 50
   },
   "m_displayName": "BOUFTOU - HUB - Vaincre 50 adversaires en un seul coup",
diff --git a/data/json/SubAchievementDefinition/5189.json b/data/json/SubAchievementDefinition/5189.json
index f17081bdbff425294eb6bf35610bbe97bbf70c5a..2d25d33608a49c33934470ed4fdd0e01428e07d7 100644
--- a/data/json/SubAchievementDefinition/5189.json
+++ b/data/json/SubAchievementDefinition/5189.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 5189,
-    "parentDataId": 3476,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 3476
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/519.json b/data/json/SubAchievementDefinition/519.json
index cf6a29c02693014270e4b2f0c86d14c85ee58715..7cf9cc6ee1faf428192e1f84fe8a66cff6c03008 100644
--- a/data/json/SubAchievementDefinition/519.json
+++ b/data/json/SubAchievementDefinition/519.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 519,
-    "parentDataId": 854,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 854
+    },
     "completionThreshold": 100
   },
   "m_displayName": "TOFU - Hub - Vaincre 100 Tofus",
diff --git a/data/json/SubAchievementDefinition/520.json b/data/json/SubAchievementDefinition/520.json
index 0b3b0dcb48f4e809e209e15187a1735946b6fcb4..ebc6ebca7a2f1da1fd7232c6fa489e54db20d087 100644
--- a/data/json/SubAchievementDefinition/520.json
+++ b/data/json/SubAchievementDefinition/520.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 520,
-    "parentDataId": 623,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 623
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Jouer 5 MALADIES dans un combat",
diff --git a/data/json/SubAchievementDefinition/521.json b/data/json/SubAchievementDefinition/521.json
index c68e0cf8cee951902b129d84e7d8500705a65ad3..a831506a88cf3152ca329a3874442dd1807404e3 100644
--- a/data/json/SubAchievementDefinition/521.json
+++ b/data/json/SubAchievementDefinition/521.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 521,
-    "parentDataId": 61,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 61
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - ARGENT - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/522.json b/data/json/SubAchievementDefinition/522.json
index 9de590c777cea10992da67ba8c539e8ec4fa7bc6..dad4f0826c366ad7798f8f08b411b12d40ba53b0 100644
--- a/data/json/SubAchievementDefinition/522.json
+++ b/data/json/SubAchievementDefinition/522.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 522,
-    "parentDataId": 970,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 970
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/523.json b/data/json/SubAchievementDefinition/523.json
index bc293f4f302d1806017e841aa245c2700605950f..0e9122b468dbddf4cfefe78edccef59754c176d1 100644
--- a/data/json/SubAchievementDefinition/523.json
+++ b/data/json/SubAchievementDefinition/523.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 523,
-    "parentDataId": 244,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 244
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Vaincre le Grignoteur sans qu\u0027il sacrifie un seul Avorton",
diff --git a/data/json/SubAchievementDefinition/533.json b/data/json/SubAchievementDefinition/533.json
index 8d6c40f5ac9c87d1ac29416399face733529843e..28be2556f71e2f27508d0c9ccc8b6a0ebb9d0ee7 100644
--- a/data/json/SubAchievementDefinition/533.json
+++ b/data/json/SubAchievementDefinition/533.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 533,
-    "parentDataId": 479,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 479
+    },
     "completionThreshold": 5
   },
   "m_displayName": "COCHON - Dungeon - OR - Achever 5 Porigamis en premier contre des boss",
diff --git a/data/json/SubAchievementDefinition/534.json b/data/json/SubAchievementDefinition/534.json
index ed327e9794de1f573a670d1daadcf6f184ddb70b..1cd30a0cba3421e1b4276b716be5c5dcac0312d5 100644
--- a/data/json/SubAchievementDefinition/534.json
+++ b/data/json/SubAchievementDefinition/534.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 534,
-    "parentDataId": 573,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 573
+    },
     "completionThreshold": 200
   },
   "m_displayName": "CHUCHOTEUR - HUB - 06 Avoir subi 200 attaques Combo",
diff --git a/data/json/SubAchievementDefinition/539.json b/data/json/SubAchievementDefinition/539.json
index 8e8c3a4cafb031a541da168d46d798b10d5d7888..661fe99782f1303b6ca3ce76ff61827d798bbc1c 100644
--- a/data/json/SubAchievementDefinition/539.json
+++ b/data/json/SubAchievementDefinition/539.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 539,
-    "parentDataId": 275,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 275
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Retrouver Boufquette saine et sauve",
diff --git a/data/json/SubAchievementDefinition/543.json b/data/json/SubAchievementDefinition/543.json
index 3cf413ea20e676820e8340ffaa0a3506eedd5c24..b79c49c746042c8a3052a8447d1e9a64a5d304d2 100644
--- a/data/json/SubAchievementDefinition/543.json
+++ b/data/json/SubAchievementDefinition/543.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 543,
-    "parentDataId": 784,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 784
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/544.json b/data/json/SubAchievementDefinition/544.json
index 9b88b87c191ef7cb1db1f824d2fdb69407fe5ae5..cd90a02b2653944b669190d2571752cd4bfc2fe2 100644
--- a/data/json/SubAchievementDefinition/544.json
+++ b/data/json/SubAchievementDefinition/544.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 544,
-    "parentDataId": 488,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 488
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/546.json b/data/json/SubAchievementDefinition/546.json
index 33ac09c05c68ba4654c7cc1c736a05ce0be3280f..08b97d51280ed49f590126f101ae2d03dfc1a597 100644
--- a/data/json/SubAchievementDefinition/546.json
+++ b/data/json/SubAchievementDefinition/546.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 546,
-    "parentDataId": 454,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 454
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/549.json b/data/json/SubAchievementDefinition/549.json
index 4686939575b3363940a35888897c181e495b04f7..4059362ca7babb9dcd860e3330b854f7ec27232e 100644
--- a/data/json/SubAchievementDefinition/549.json
+++ b/data/json/SubAchievementDefinition/549.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 549,
-    "parentDataId": 236,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 236
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/55.json b/data/json/SubAchievementDefinition/55.json
index 73fbd6f08f03f6a399dfb73d5e863e343f260471..3f68671650536a9506ef8b0d1db56dfeec268493 100644
--- a/data/json/SubAchievementDefinition/55.json
+++ b/data/json/SubAchievementDefinition/55.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 55,
-    "parentDataId": 905,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 905
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 22 Niels Laren sous couverture doit achever tous ses alliés",
diff --git a/data/json/SubAchievementDefinition/550.json b/data/json/SubAchievementDefinition/550.json
index 83121dc18b0f90c6cc678f662bae2268559089ff..296fb014a5d7419a5547c3c423c2a014451e329c 100644
--- a/data/json/SubAchievementDefinition/550.json
+++ b/data/json/SubAchievementDefinition/550.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 550,
-    "parentDataId": 933,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 933
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Obtenir 1000 PQ",
diff --git a/data/json/SubAchievementDefinition/551.json b/data/json/SubAchievementDefinition/551.json
index 829223e735d8085668f70aa7ddd6de022ba60b7d..ee954a783d84199e746a300f2a6c90fa99713b6e 100644
--- a/data/json/SubAchievementDefinition/551.json
+++ b/data/json/SubAchievementDefinition/551.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 551,
-    "parentDataId": 677,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 677
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Vaincre le Bworkdog en premier",
diff --git a/data/json/SubAchievementDefinition/552.json b/data/json/SubAchievementDefinition/552.json
index acbac89bad11bfd7bdfa94ba4d91c0ba15eeb267..e311971f35d2c56bffa85fe65fb496a90c29a5d3 100644
--- a/data/json/SubAchievementDefinition/552.json
+++ b/data/json/SubAchievementDefinition/552.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 552,
-    "parentDataId": 961,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 961
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/555.json b/data/json/SubAchievementDefinition/555.json
index 88fa71182a64445e661b805f924f1577a066556c..cdc7f5710fd8dabb62464d510157d105dac0ddae 100644
--- a/data/json/SubAchievementDefinition/555.json
+++ b/data/json/SubAchievementDefinition/555.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 555,
-    "parentDataId": 228,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 228
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - WIP 2",
diff --git a/data/json/SubAchievementDefinition/556.json b/data/json/SubAchievementDefinition/556.json
index cd87730603b2ef98abc72796a2191905360b4195..ba752bd051ea78a6bedb8f16935e10a81d3cadd5 100644
--- a/data/json/SubAchievementDefinition/556.json
+++ b/data/json/SubAchievementDefinition/556.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 556,
-    "parentDataId": 524,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 524
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 1",
diff --git a/data/json/SubAchievementDefinition/56.json b/data/json/SubAchievementDefinition/56.json
index fcb6424bc747bb93fb44b981389be7f904d4f98a..4be3d3aef05f23245ea44116f4c20a135381ecdd 100644
--- a/data/json/SubAchievementDefinition/56.json
+++ b/data/json/SubAchievementDefinition/56.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 56,
-    "parentDataId": 715,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 715
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TOFU - Hub - Achever 50 Tofus envolés",
diff --git a/data/json/SubAchievementDefinition/561.json b/data/json/SubAchievementDefinition/561.json
index 573146a7f96ceaf9d81951eb4f7c7ed1fca153cd..5ec7a348dec02d0562850b0d8fe45c25355a834d 100644
--- a/data/json/SubAchievementDefinition/561.json
+++ b/data/json/SubAchievementDefinition/561.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 561,
-    "parentDataId": 238,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 238
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/564.json b/data/json/SubAchievementDefinition/564.json
index 8bad383c8c6a0170ef8f4590f87add47b4d685e4..774d27e8c0018a33e26f1230d24d9ae4683003dd 100644
--- a/data/json/SubAchievementDefinition/564.json
+++ b/data/json/SubAchievementDefinition/564.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 564,
-    "parentDataId": 897,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 897
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - ARGENT - Remporter un combat sans subir une seule aura",
diff --git a/data/json/SubAchievementDefinition/565.json b/data/json/SubAchievementDefinition/565.json
index 7b3b8b79eb552596f6f8daa54f1be952ced66227..1c732b0676589b68ebcbbd83e5e6b4c5dfab2ed1 100644
--- a/data/json/SubAchievementDefinition/565.json
+++ b/data/json/SubAchievementDefinition/565.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 565,
-    "parentDataId": 820,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 820
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Aider le PNJ 3",
diff --git a/data/json/SubAchievementDefinition/566.json b/data/json/SubAchievementDefinition/566.json
index 884b12c6e705aabcccccf0cac9ca509141596fd4..e8136ebf0704da2d6a3f4c803a54933577c11a35 100644
--- a/data/json/SubAchievementDefinition/566.json
+++ b/data/json/SubAchievementDefinition/566.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 566,
-    "parentDataId": 523,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 523
+    },
     "completionThreshold": 20
   },
   "m_displayName": "CHUCHOTEUR - HUB - 10 Détruire 20 Monolithes Occultes",
diff --git a/data/json/SubAchievementDefinition/5665.json b/data/json/SubAchievementDefinition/5665.json
index 4c927c75723fbcc544df019c67e43102d004cf1c..3b65a3b442b4df8496b1a6a36c75500ae22452c2 100644
--- a/data/json/SubAchievementDefinition/5665.json
+++ b/data/json/SubAchievementDefinition/5665.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 5665,
-    "parentDataId": 246,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 246
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 6",
diff --git a/data/json/SubAchievementDefinition/567.json b/data/json/SubAchievementDefinition/567.json
index 0fa46637c338884c3f8842f72a76963f86b9b40f..b07ef57f247842c0a9fe2eabaec099a227b5df60 100644
--- a/data/json/SubAchievementDefinition/567.json
+++ b/data/json/SubAchievementDefinition/567.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 567,
-    "parentDataId": 146,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 146
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Terminer le donjon en coop",
diff --git a/data/json/SubAchievementDefinition/57.json b/data/json/SubAchievementDefinition/57.json
index f5d2462115c3f9643332665f538a35a7a4eb32b8..efb67d6bb11d459f20c147c75dab23c5c72b4d94 100644
--- a/data/json/SubAchievementDefinition/57.json
+++ b/data/json/SubAchievementDefinition/57.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 57,
-    "parentDataId": 413,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 413
+    },
     "completionThreshold": 30
   },
   "m_displayName": "CHAFER - Q03 - Vaincre 30 Pikaross",
diff --git a/data/json/SubAchievementDefinition/574.json b/data/json/SubAchievementDefinition/574.json
index d5da94e8d3995bef9a4994bded79296eda492026..43a325df46afebb73e02ad95ad4ef58f90730c21 100644
--- a/data/json/SubAchievementDefinition/574.json
+++ b/data/json/SubAchievementDefinition/574.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 574,
-    "parentDataId": 157,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 157
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Vaincre une Tofoune sans finir plus d\u0027un tour sans qu\u0027elle soit envolée",
diff --git a/data/json/SubAchievementDefinition/577.json b/data/json/SubAchievementDefinition/577.json
index e1dc60994d15968db1fc7142a8edbe3f18f49cfe..062a60f3989117f7f97811d0ffe6f0335309b821 100644
--- a/data/json/SubAchievementDefinition/577.json
+++ b/data/json/SubAchievementDefinition/577.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 577,
-    "parentDataId": 719,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 719
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Jouer un combat avec au moins 15 flaques de lave sur le terrain",
diff --git a/data/json/SubAchievementDefinition/58.json b/data/json/SubAchievementDefinition/58.json
index 9ce135f2430cc674a9c2a7127c9133006a957745..502b3b3c4e8fd51ebdd0f29a898d131bbce00ffd 100644
--- a/data/json/SubAchievementDefinition/58.json
+++ b/data/json/SubAchievementDefinition/58.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 58,
-    "parentDataId": 374,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 374
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/581.json b/data/json/SubAchievementDefinition/581.json
index 511bdcf6934857d377d245841a52edee47248def..9280cafce81df7783a94d151136ba2767ed86934 100644
--- a/data/json/SubAchievementDefinition/581.json
+++ b/data/json/SubAchievementDefinition/581.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 581,
-    "parentDataId": 839,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 839
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/583.json b/data/json/SubAchievementDefinition/583.json
index 676f00ce9827e6f66c7f63b4917b39448b762e33..812fa81a47df60377423d0812aa8f94fee84d6a6 100644
--- a/data/json/SubAchievementDefinition/583.json
+++ b/data/json/SubAchievementDefinition/583.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 583,
-    "parentDataId": 67,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 67
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Ne pas subir une seule attaque d\u0027un bwork non enragé en une traversée",
diff --git a/data/json/SubAchievementDefinition/585.json b/data/json/SubAchievementDefinition/585.json
index 36db3b58fb55d7e70d5c7123dae7be811e877c08..62c24147c6fe7a216a7dc538fea08b056a907140 100644
--- a/data/json/SubAchievementDefinition/585.json
+++ b/data/json/SubAchievementDefinition/585.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 585,
-    "parentDataId": 76,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 76
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/587.json b/data/json/SubAchievementDefinition/587.json
index c3e03e780d63479676b811b306d7aabb5c34ba12..8c3ed019291af838264d0a5411b3f708ce869c70 100644
--- a/data/json/SubAchievementDefinition/587.json
+++ b/data/json/SubAchievementDefinition/587.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 587,
-    "parentDataId": 63,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 63
+    },
     "completionThreshold": 30
   },
   "m_displayName": "COCHON - Q03 - 11 Vaincre 30 Sbires du Clan Boucher",
diff --git a/data/json/SubAchievementDefinition/588.json b/data/json/SubAchievementDefinition/588.json
index 5de31d62087afc234f06c3b7fb21a04735d2dd1b..c7283b50584408f35c05212c5c01df513139740e 100644
--- a/data/json/SubAchievementDefinition/588.json
+++ b/data/json/SubAchievementDefinition/588.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 588,
-    "parentDataId": 217,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 217
+    },
     "completionThreshold": 25
   },
   "m_displayName": "CHUCHOTEUR - HUB - 13 Détruire 25 Cristaux de Roche",
diff --git a/data/json/SubAchievementDefinition/589.json b/data/json/SubAchievementDefinition/589.json
index c436268ed13d9bf005555dcc5dc99ead47eeded1..962bf707343290131b8de586a8277d3c44689636 100644
--- a/data/json/SubAchievementDefinition/589.json
+++ b/data/json/SubAchievementDefinition/589.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 589,
-    "parentDataId": 665,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 665
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/591.json b/data/json/SubAchievementDefinition/591.json
index 1462b86e0b1224c275cb287c116df6e2d94a37bd..489deafb1a36c9995cc1714d18340b41285a4725 100644
--- a/data/json/SubAchievementDefinition/591.json
+++ b/data/json/SubAchievementDefinition/591.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 591,
-    "parentDataId": 370,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 370
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - IX",
diff --git a/data/json/SubAchievementDefinition/595.json b/data/json/SubAchievementDefinition/595.json
index 39579093a9aa063a33b2d2921227b2147a306140..f0eea713352a269c5e366b6d93a876695bd20770 100644
--- a/data/json/SubAchievementDefinition/595.json
+++ b/data/json/SubAchievementDefinition/595.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 595,
-    "parentDataId": 36,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 36
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/596.json b/data/json/SubAchievementDefinition/596.json
index 6ff30e73c496bae0d7984f3800ec8b76e7432221..c5c61fdfe744dac97c7f857760754113011814fb 100644
--- a/data/json/SubAchievementDefinition/596.json
+++ b/data/json/SubAchievementDefinition/596.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 596,
-    "parentDataId": 355,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 355
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TOFU - Hub - Faire tomber 50 Tofus",
diff --git a/data/json/SubAchievementDefinition/597.json b/data/json/SubAchievementDefinition/597.json
index 592c3639dbd96956526d47d17004e59ba486c401..8939f89813eda946e0daf10dbcc1f1bd4c97a23c 100644
--- a/data/json/SubAchievementDefinition/597.json
+++ b/data/json/SubAchievementDefinition/597.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 597,
-    "parentDataId": 173,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 173
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/598.json b/data/json/SubAchievementDefinition/598.json
index 7cad6f233c5441a97a7921225ed3f405be8ebe5e..26602d7db43bd1551bbba7e59b53ccc43f6682de 100644
--- a/data/json/SubAchievementDefinition/598.json
+++ b/data/json/SubAchievementDefinition/598.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 598,
-    "parentDataId": 766,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 766
+    },
     "completionThreshold": 30
   },
   "m_displayName": "CHUCHOTEUR - Q01 - 13 Tuer 30 Chuchoteurs Montés sur un Craqueleur",
diff --git a/data/json/SubAchievementDefinition/60.json b/data/json/SubAchievementDefinition/60.json
index 4f0bc02bf9c24070592f283d69de8df95b441832..ce54f0d8ee2cf1ec65e7df744abbe143cddc0a94 100644
--- a/data/json/SubAchievementDefinition/60.json
+++ b/data/json/SubAchievementDefinition/60.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 60,
-    "parentDataId": 583,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 583
+    },
     "completionThreshold": 30
   },
   "m_displayName": "CHUCHOTEUR - HUB - 08 Tuer 30 Chuchoteurs en Posture Défensive",
diff --git a/data/json/SubAchievementDefinition/600.json b/data/json/SubAchievementDefinition/600.json
index 884f0776bfa68f6a2074ef5f3144d08a9c21d828..bc3c52b7c83090279a95be24e09a1916bb9b5914 100644
--- a/data/json/SubAchievementDefinition/600.json
+++ b/data/json/SubAchievementDefinition/600.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 600,
-    "parentDataId": 973,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 973
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - OR - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/603.json b/data/json/SubAchievementDefinition/603.json
index 5e89838ad078a668464ae861f8257db5820f5ac0..36ea1c1685853a2a77c7f9f88261151b0fb67669 100644
--- a/data/json/SubAchievementDefinition/603.json
+++ b/data/json/SubAchievementDefinition/603.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 603,
-    "parentDataId": 64,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 64
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 21 Vaincre Jon Kriz uniquement avec Danny",
diff --git a/data/json/SubAchievementDefinition/6036.json b/data/json/SubAchievementDefinition/6036.json
index cbb8d0ee22d960e2ee1799d8a356ad18f5b559f4..eef35e30a08c757b5b5306e88918e80ce8ee4d39 100644
--- a/data/json/SubAchievementDefinition/6036.json
+++ b/data/json/SubAchievementDefinition/6036.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 6036,
-    "parentDataId": 194,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 194
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 7",
diff --git a/data/json/SubAchievementDefinition/604.json b/data/json/SubAchievementDefinition/604.json
index 684b40af925c72257227f655c0d3fa8e7afef241..3498edcdf3b979d3617cbb5128084afc2ab4b63a 100644
--- a/data/json/SubAchievementDefinition/604.json
+++ b/data/json/SubAchievementDefinition/604.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 604,
-    "parentDataId": 354,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 354
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/605.json b/data/json/SubAchievementDefinition/605.json
index ccd1e6d61860c103a32a8313f82845664268c60f..fb0566f3105c1d987b20eb51d760d1d2ed4877ae 100644
--- a/data/json/SubAchievementDefinition/605.json
+++ b/data/json/SubAchievementDefinition/605.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 605,
-    "parentDataId": 974,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 974
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Affronter 6 Avortons ou plus en même temps",
diff --git a/data/json/SubAchievementDefinition/606.json b/data/json/SubAchievementDefinition/606.json
index 93901162790b6b47c19411921715ca0a98eb0501..e554e58ec224bf7c79b771e6b835e915eaa69cf0 100644
--- a/data/json/SubAchievementDefinition/606.json
+++ b/data/json/SubAchievementDefinition/606.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 606,
-    "parentDataId": 435,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 435
+    },
     "completionThreshold": 10
   },
   "m_displayName": "COCHON - Q01 - 15 Achever 10 cochons possédant au moins 3 auras",
diff --git a/data/json/SubAchievementDefinition/607.json b/data/json/SubAchievementDefinition/607.json
index a35cde0ab2e043d304407a4582076956c89c3cdc..978aea8d3be6017751d3857a256d1bfa2cbffa0a 100644
--- a/data/json/SubAchievementDefinition/607.json
+++ b/data/json/SubAchievementDefinition/607.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 607,
-    "parentDataId": 490,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 490
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - ARGENT - Remporter un combat en subissant moins de 3 rages",
diff --git a/data/json/SubAchievementDefinition/609.json b/data/json/SubAchievementDefinition/609.json
index e6a233ddd047668201f8396e3852e75d37ab92dd..8d6cab5bd9c1346bea0cd6d446d10d044f3b9c03 100644
--- a/data/json/SubAchievementDefinition/609.json
+++ b/data/json/SubAchievementDefinition/609.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 609,
-    "parentDataId": 198,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 198
+    },
     "completionThreshold": 50
   },
   "m_displayName": "BWORK - Dungeon - Réussir 50 Challenges",
diff --git a/data/json/SubAchievementDefinition/610.json b/data/json/SubAchievementDefinition/610.json
index f9336eec2e5daf55b19016e295e2f561efcca028..45252450957814a4ac2c205ac8eab78093898c98 100644
--- a/data/json/SubAchievementDefinition/610.json
+++ b/data/json/SubAchievementDefinition/610.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 610,
-    "parentDataId": 956,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 956
+    },
     "completionThreshold": 100
   },
   "m_displayName": "COCHON - HUB - 05 Remporter 100 Combats",
diff --git a/data/json/SubAchievementDefinition/614.json b/data/json/SubAchievementDefinition/614.json
index cbdf72f4c7fa6a58ee7960944518c432f9ec9fdf..b71f5ca8646e17a6badf0195c4fd295c8e8185ea 100644
--- a/data/json/SubAchievementDefinition/614.json
+++ b/data/json/SubAchievementDefinition/614.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 614,
-    "parentDataId": 872,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 872
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - X",
diff --git a/data/json/SubAchievementDefinition/615.json b/data/json/SubAchievementDefinition/615.json
index 340f261c45ab39fc837ef9afc225a7fd7bde4fd9..bb89fe5fda1770b69343eefab450a49476e9ff05 100644
--- a/data/json/SubAchievementDefinition/615.json
+++ b/data/json/SubAchievementDefinition/615.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 615,
-    "parentDataId": 235,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 235
+    },
     "completionThreshold": 50
   },
   "m_displayName": "BWORK - Hub - Subir 50 étreintes",
diff --git a/data/json/SubAchievementDefinition/616.json b/data/json/SubAchievementDefinition/616.json
index 216d1d28544b8903788a1702e91deb0d0a8e3248..cb7c1ab1572ba55ebc99850edbacc0bf1d177c7c 100644
--- a/data/json/SubAchievementDefinition/616.json
+++ b/data/json/SubAchievementDefinition/616.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 616,
-    "parentDataId": 579,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 579
+    },
     "completionThreshold": 500
   },
   "m_displayName": "BWORK - Hub - Vaincre 500 Bworks",
diff --git a/data/json/SubAchievementDefinition/617.json b/data/json/SubAchievementDefinition/617.json
index b4edbb45c111a63310fe6ef4fcab39d92959ca3f..20020874fb6cdbf0fad89da559fb503d5c0cbf77 100644
--- a/data/json/SubAchievementDefinition/617.json
+++ b/data/json/SubAchievementDefinition/617.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 617,
-    "parentDataId": 263,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 263
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/619.json b/data/json/SubAchievementDefinition/619.json
index 9e98645bd00ddd3401aea60c107a4440ae5a0f79..d32c1fb3411e942c7a95c9f1b3f205067d6e5408 100644
--- a/data/json/SubAchievementDefinition/619.json
+++ b/data/json/SubAchievementDefinition/619.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 619,
-    "parentDataId": 443,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 443
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - OR - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/620.json b/data/json/SubAchievementDefinition/620.json
index f4556fa8fa1726def318e41e5df95a45adf4d8ff..90636383d0658c798faaaf4f941acaee2d67101e 100644
--- a/data/json/SubAchievementDefinition/620.json
+++ b/data/json/SubAchievementDefinition/620.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 620,
-    "parentDataId": 834,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 834
+    },
     "completionThreshold": 100
   },
   "m_displayName": "TAURE - Hub - Remporter 100 combats",
diff --git a/data/json/SubAchievementDefinition/622.json b/data/json/SubAchievementDefinition/622.json
index 59f4f90a9b16251de870c9222785a70148c51ba2..ff54ce0c1114897272fac5421b8e2cd3a31fff85 100644
--- a/data/json/SubAchievementDefinition/622.json
+++ b/data/json/SubAchievementDefinition/622.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 622,
-    "parentDataId": 371,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 371
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Achievement 4",
diff --git a/data/json/SubAchievementDefinition/623.json b/data/json/SubAchievementDefinition/623.json
index 1e5da3f26cda5ad0f3fa42c52c21a3d6aea16b87..124b02ff76c2f73bf86d4b28725a5cac2148c192 100644
--- a/data/json/SubAchievementDefinition/623.json
+++ b/data/json/SubAchievementDefinition/623.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 623,
-    "parentDataId": 884,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 884
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/624.json b/data/json/SubAchievementDefinition/624.json
index 4106a547ce4325f8915d8db4f7b82b5baa68daba..63be537dd46da732e495565719a5635a94d8229d 100644
--- a/data/json/SubAchievementDefinition/624.json
+++ b/data/json/SubAchievementDefinition/624.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 624,
-    "parentDataId": 822,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 822
+    },
     "completionThreshold": 10
   },
   "m_displayName": "BWORK - Dungeon - ARGENT - Remporter 10 combats sans flaque de lave sur le terrain",
diff --git a/data/json/SubAchievementDefinition/625.json b/data/json/SubAchievementDefinition/625.json
index 252a2e6dccd806ffb1fd9e5ae0ffaee4233095b3..832a030db62d319b82641fe0ce8065e5d5fb0801 100644
--- a/data/json/SubAchievementDefinition/625.json
+++ b/data/json/SubAchievementDefinition/625.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 625,
-    "parentDataId": 685,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 685
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Vaincre Vorti après sa trahison",
diff --git a/data/json/SubAchievementDefinition/627.json b/data/json/SubAchievementDefinition/627.json
index 5d1e77be49779b31d849642fe9f60a5439c172ab..2f22116fa81a1b2a88fa8aef056d18b1f5276e92 100644
--- a/data/json/SubAchievementDefinition/627.json
+++ b/data/json/SubAchievementDefinition/627.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 627,
-    "parentDataId": 498,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 498
+    },
     "completionThreshold": 50
   },
   "m_displayName": "TAURE - Dungeon - Réussir 50 challenges",
diff --git a/data/json/SubAchievementDefinition/63.json b/data/json/SubAchievementDefinition/63.json
index cca0b26348f00f65b3d1f3014b9ca146dba53730..899c678dbe3fe27fb7694030acff5455ee8288b9 100644
--- a/data/json/SubAchievementDefinition/63.json
+++ b/data/json/SubAchievementDefinition/63.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 63,
-    "parentDataId": 276,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 276
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - BRONZE - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/634.json b/data/json/SubAchievementDefinition/634.json
index 36f18c5dc2818d354391b414edbdea70ef18f7ec..67427ac7f873bdb75203b7fe43e42f526a019329 100644
--- a/data/json/SubAchievementDefinition/634.json
+++ b/data/json/SubAchievementDefinition/634.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 634,
-    "parentDataId": 475,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 475
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - ARGENT - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/635.json b/data/json/SubAchievementDefinition/635.json
index e5587a8b3b0a6041323e571775093d593cc3821c..9d8264dcafa8081ad5eadc3dd8bc7da7d9a00cdf 100644
--- a/data/json/SubAchievementDefinition/635.json
+++ b/data/json/SubAchievementDefinition/635.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 635,
-    "parentDataId": 311,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 311
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/639.json b/data/json/SubAchievementDefinition/639.json
index 80c42edd91bf369349b9db03b1234192c0204062..94118dfbef1ce26113820acbf22cc04787015a45 100644
--- a/data/json/SubAchievementDefinition/639.json
+++ b/data/json/SubAchievementDefinition/639.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 639,
-    "parentDataId": 880,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 880
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/644.json b/data/json/SubAchievementDefinition/644.json
index 139abe9a035ea7cd79a4a0e79f58b9de7904661f..d87a9fc0a802956a0f030e44de98313b0243c5b3 100644
--- a/data/json/SubAchievementDefinition/644.json
+++ b/data/json/SubAchievementDefinition/644.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 644,
-    "parentDataId": 997,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 997
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - ARGENT - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/647.json b/data/json/SubAchievementDefinition/647.json
index 494dfaed0f2d0178092119d1df2cf11a249ea459..f12dbd786bce0c2d3eee219ba39d47660fd0e0ee 100644
--- a/data/json/SubAchievementDefinition/647.json
+++ b/data/json/SubAchievementDefinition/647.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 647,
-    "parentDataId": 547,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 547
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/648.json b/data/json/SubAchievementDefinition/648.json
index 83dc138b8b440b3369b20b81dbf48cf7e6ebf812..b4f0814069dc8bfd9c0f5542e7574bbdb8d4c6c3 100644
--- a/data/json/SubAchievementDefinition/648.json
+++ b/data/json/SubAchievementDefinition/648.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 648,
-    "parentDataId": 591,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 591
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - OR - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/649.json b/data/json/SubAchievementDefinition/649.json
index f50c4c84428b7e33ee4fdadee208b79a4b54242c..4cacabd8c9aa982d6dec49a26600d7522a91ff47 100644
--- a/data/json/SubAchievementDefinition/649.json
+++ b/data/json/SubAchievementDefinition/649.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 649,
-    "parentDataId": 132,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 132
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/650.json b/data/json/SubAchievementDefinition/650.json
index 98054054950d2237c56a2e3dcf6aab4393a77fc5..bbc663345c9770f0c1194b867edb41605c3f7f00 100644
--- a/data/json/SubAchievementDefinition/650.json
+++ b/data/json/SubAchievementDefinition/650.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 650,
-    "parentDataId": 972,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 972
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - (WIP - Secret)",
diff --git a/data/json/SubAchievementDefinition/6510.json b/data/json/SubAchievementDefinition/6510.json
index 4670d681d163b8eabc20cf693a32f9e3bfbfc63a..c0fa5cf507983189f45665d4e8a58abfc015b537 100644
--- a/data/json/SubAchievementDefinition/6510.json
+++ b/data/json/SubAchievementDefinition/6510.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 6510,
-    "parentDataId": 698,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 698
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 9",
diff --git a/data/json/SubAchievementDefinition/652.json b/data/json/SubAchievementDefinition/652.json
index 435082741605a526efdc152392ead5b7e2c545ad..0dcce7fd5ddb5d8f6ab9fa39769ec30028d2188a 100644
--- a/data/json/SubAchievementDefinition/652.json
+++ b/data/json/SubAchievementDefinition/652.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 652,
-    "parentDataId": 148,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 148
+    },
     "completionThreshold": 50
   },
   "m_displayName": "COCHON - HUB - 07 Subir 50 Coups Critiques",
diff --git a/data/json/SubAchievementDefinition/655.json b/data/json/SubAchievementDefinition/655.json
index 8d097d6e60d361b25ebe78c85adc7bc991f6b8bd..6565851329accae7c0ad3d45e37d4157468cf437 100644
--- a/data/json/SubAchievementDefinition/655.json
+++ b/data/json/SubAchievementDefinition/655.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 655,
-    "parentDataId": 449,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 449
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Achever le Grand Laineux avec le Dr. Teigne",
diff --git a/data/json/SubAchievementDefinition/656.json b/data/json/SubAchievementDefinition/656.json
index 462aa194e751b937faf903707d36787d8a679570..0b97d804ed8b745929208e0ff7e30dc23e065e4c 100644
--- a/data/json/SubAchievementDefinition/656.json
+++ b/data/json/SubAchievementDefinition/656.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 656,
-    "parentDataId": 936,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 936
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - [TODO] 13",
diff --git a/data/json/SubAchievementDefinition/657.json b/data/json/SubAchievementDefinition/657.json
index 4bb981a6d4bcda5cd1845b95b1687e9c7ca206bf..aa40bcd36114a9df04805c8813599c0cac44050f 100644
--- a/data/json/SubAchievementDefinition/657.json
+++ b/data/json/SubAchievementDefinition/657.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 657,
-    "parentDataId": 821,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 821
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - V",
diff --git a/data/json/SubAchievementDefinition/658.json b/data/json/SubAchievementDefinition/658.json
index 060a1325f0f8cc20b76b046614c9ad489b804c2c..d760aefce7becbd6cc3983ee44e77c7647a4c7c4 100644
--- a/data/json/SubAchievementDefinition/658.json
+++ b/data/json/SubAchievementDefinition/658.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 658,
-    "parentDataId": 624,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 624
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Achever un Bworkakorn en dernier",
diff --git a/data/json/SubAchievementDefinition/659.json b/data/json/SubAchievementDefinition/659.json
index 838e1c31a63d763de2eb86faf04391ca5c41b112..534a2b1e0609592ff3f0a6403d5ed6945db05b8c 100644
--- a/data/json/SubAchievementDefinition/659.json
+++ b/data/json/SubAchievementDefinition/659.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 659,
-    "parentDataId": 853,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 853
+    },
     "completionThreshold": 250
   },
   "m_displayName": "BWORK - Hub - Vaincre 250 Bworks",
diff --git a/data/json/SubAchievementDefinition/661.json b/data/json/SubAchievementDefinition/661.json
index d4c886c84dab357a89da64c8cf068d8371ddfbc2..f8f26d8e8260d2d575a9cbaf1a2f41fa22988eb1 100644
--- a/data/json/SubAchievementDefinition/661.json
+++ b/data/json/SubAchievementDefinition/661.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 661,
-    "parentDataId": 900,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 900
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - OR - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/663.json b/data/json/SubAchievementDefinition/663.json
index 13dc03a9b29d480ad71cd3ac8b6f70958c7f0223..24d8dd90b21d528b534e19167e81ee30d1860a2b 100644
--- a/data/json/SubAchievementDefinition/663.json
+++ b/data/json/SubAchievementDefinition/663.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 663,
-    "parentDataId": 373,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 373
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Achever une Horde de 4 Tofus en un seul tour",
diff --git a/data/json/SubAchievementDefinition/664.json b/data/json/SubAchievementDefinition/664.json
index bc45e942e486149b6dcb8c08f65b1eb2889f606b..035a64f36a42512cbbe897e975c6888f1fe15d3c 100644
--- a/data/json/SubAchievementDefinition/664.json
+++ b/data/json/SubAchievementDefinition/664.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 664,
-    "parentDataId": 260,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 260
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Avoir vaincu le Patriarche",
diff --git a/data/json/SubAchievementDefinition/666.json b/data/json/SubAchievementDefinition/666.json
index 84de87ec70940a83909de3e2b6d96b4dbef74505..cb01500bde120b2326f9b3f20b0f0f5b328d820f 100644
--- a/data/json/SubAchievementDefinition/666.json
+++ b/data/json/SubAchievementDefinition/666.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 666,
-    "parentDataId": 2171,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2171
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/67.json b/data/json/SubAchievementDefinition/67.json
index b5759956bf7555835aee237212113a46f93e1876..4935e788967bd350768cb6167f4301a80610d920 100644
--- a/data/json/SubAchievementDefinition/67.json
+++ b/data/json/SubAchievementDefinition/67.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 67,
-    "parentDataId": 226,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 226
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/671.json b/data/json/SubAchievementDefinition/671.json
index 9b32cb9dce243427c0784104a93322a7368d8adc..9eade8e14a71fcf86af07a53fdbdf3a6a9ac3794 100644
--- a/data/json/SubAchievementDefinition/671.json
+++ b/data/json/SubAchievementDefinition/671.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 671,
-    "parentDataId": 965,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 965
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Voir un Bwork Parle-Lave mourir dans une flaque de lave",
diff --git a/data/json/SubAchievementDefinition/677.json b/data/json/SubAchievementDefinition/677.json
index bda41eacf2d7c1c29bdb8e2b537221843b4bad79..e44218f41ab1aff7e97e206b5fd44e8d6b418ec2 100644
--- a/data/json/SubAchievementDefinition/677.json
+++ b/data/json/SubAchievementDefinition/677.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 677,
-    "parentDataId": 467,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 467
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - II",
diff --git a/data/json/SubAchievementDefinition/678.json b/data/json/SubAchievementDefinition/678.json
index f65a620aa9045ed8063c4a90930999b71348753a..c7e836debfbb476874e48570685bf296bd79eb6f 100644
--- a/data/json/SubAchievementDefinition/678.json
+++ b/data/json/SubAchievementDefinition/678.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 678,
-    "parentDataId": 82,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 82
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - BRONZE - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/679.json b/data/json/SubAchievementDefinition/679.json
index 885c7aa9a39c9fe78a2fe543e87072209b294cee..f2dad59dc2b5a30fd04cdd95ff360c2826499d67 100644
--- a/data/json/SubAchievementDefinition/679.json
+++ b/data/json/SubAchievementDefinition/679.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 679,
-    "parentDataId": 495,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 495
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Tuer Bworky en un seul coup",
diff --git a/data/json/SubAchievementDefinition/682.json b/data/json/SubAchievementDefinition/682.json
index 9379aa813961fdc7e080b6f0f66520a55ffa53a4..9849995f154e70a08fa313eb773f18bf72bc6951 100644
--- a/data/json/SubAchievementDefinition/682.json
+++ b/data/json/SubAchievementDefinition/682.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 682,
-    "parentDataId": 619,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 619
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 2",
diff --git a/data/json/SubAchievementDefinition/683.json b/data/json/SubAchievementDefinition/683.json
index 5b526f03a28bee3805eb9af8c9d3eb4323f57fd4..f42e4008ebb757a8037e69686a1854d6b7f184a4 100644
--- a/data/json/SubAchievementDefinition/683.json
+++ b/data/json/SubAchievementDefinition/683.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 683,
-    "parentDataId": 548,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 548
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/685.json b/data/json/SubAchievementDefinition/685.json
index 87616c4440b9f3857cc36e43bf90d1b9e9479a53..fd56ae07153dfb4cd29d2e89f08b22e65ba3ac45 100644
--- a/data/json/SubAchievementDefinition/685.json
+++ b/data/json/SubAchievementDefinition/685.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 685,
-    "parentDataId": 257,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 257
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - BRONZE - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/689.json b/data/json/SubAchievementDefinition/689.json
index dbb7f7774c424e834689a25e3293aaf164982801..9a1305be5f994d0c8a0b791c907447539831d862 100644
--- a/data/json/SubAchievementDefinition/689.json
+++ b/data/json/SubAchievementDefinition/689.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 689,
-    "parentDataId": 288,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 288
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - BRONZE - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/69.json b/data/json/SubAchievementDefinition/69.json
index f05556635437871b932f5335d829c783c5da272d..91a9b95e74d0227a8ace274171cf8a053860f29f 100644
--- a/data/json/SubAchievementDefinition/69.json
+++ b/data/json/SubAchievementDefinition/69.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 69,
-    "parentDataId": 754,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 754
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 7",
diff --git a/data/json/SubAchievementDefinition/690.json b/data/json/SubAchievementDefinition/690.json
index c4bfe43304c2844eb7278ba2827f3908bb32ef04..97703749be2cc742d2a4f058213fdd74dd879e1a 100644
--- a/data/json/SubAchievementDefinition/690.json
+++ b/data/json/SubAchievementDefinition/690.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 690,
-    "parentDataId": 35,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 35
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - OR- Chapitre I",
diff --git a/data/json/SubAchievementDefinition/693.json b/data/json/SubAchievementDefinition/693.json
index 981f7fdf8c7caf17147ec89ab6d246f0d4d3e7db..c3d267adc92980aebcea4af8aa52345ff4189c19 100644
--- a/data/json/SubAchievementDefinition/693.json
+++ b/data/json/SubAchievementDefinition/693.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 693,
-    "parentDataId": 333,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 333
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - IV",
diff --git a/data/json/SubAchievementDefinition/695.json b/data/json/SubAchievementDefinition/695.json
index 9a6670670c94fc1b475b56488eff211b15a11255..aed70356665150074fcb6633de7f5d30959f190a 100644
--- a/data/json/SubAchievementDefinition/695.json
+++ b/data/json/SubAchievementDefinition/695.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 695,
-    "parentDataId": 589,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 589
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/696.json b/data/json/SubAchievementDefinition/696.json
index 0f09c00d4025f35267958a7df6839cbf86870075..e9ef2a70c78d7ffce884e2894db704fb788f11d1 100644
--- a/data/json/SubAchievementDefinition/696.json
+++ b/data/json/SubAchievementDefinition/696.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 696,
-    "parentDataId": 948,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 948
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/697.json b/data/json/SubAchievementDefinition/697.json
index 12bbb6a307d58a3aa271ed1f5bbabc412822f705..690880c3f3db0f715c9404953530c5d72a566901 100644
--- a/data/json/SubAchievementDefinition/697.json
+++ b/data/json/SubAchievementDefinition/697.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 697,
-    "parentDataId": 342,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 342
+    },
     "completionThreshold": 20
   },
   "m_displayName": "CHAFER - Dungeon - Terminer 20 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/698.json b/data/json/SubAchievementDefinition/698.json
index cce49c58a4365ff3e79f0e7e66a097ffda7aa084..52676c171bec0de873626d6d3707685a1bb19fd7 100644
--- a/data/json/SubAchievementDefinition/698.json
+++ b/data/json/SubAchievementDefinition/698.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 698,
-    "parentDataId": 42,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 42
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Mourir sur une flaque de lave",
diff --git a/data/json/SubAchievementDefinition/703.json b/data/json/SubAchievementDefinition/703.json
index 169da249ebb410648df5eb95f03f8c2acab3c800..8bae8b2ecca71baa183140fe675bb763546650d6 100644
--- a/data/json/SubAchievementDefinition/703.json
+++ b/data/json/SubAchievementDefinition/703.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 703,
-    "parentDataId": 863,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 863
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Subir au moins 15 rages en un seul combat",
diff --git a/data/json/SubAchievementDefinition/704.json b/data/json/SubAchievementDefinition/704.json
index c9072a6e00f1285bc1d2e8e812723a1f42b142bd..2a04277369140aa37ba2b84ef647f3f26a5e313c 100644
--- a/data/json/SubAchievementDefinition/704.json
+++ b/data/json/SubAchievementDefinition/704.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 704,
-    "parentDataId": 935,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 935
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/705.json b/data/json/SubAchievementDefinition/705.json
index 78e0999880dfc7a666ad79c3b49ccd3d7d2d4dfb..251951532c96b77531f2e86dc806ec26e4c53f4e 100644
--- a/data/json/SubAchievementDefinition/705.json
+++ b/data/json/SubAchievementDefinition/705.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 705,
-    "parentDataId": 786,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 786
+    },
     "completionThreshold": 10
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 13 Terminer 10 fois le donjon Chuchoteur",
diff --git a/data/json/SubAchievementDefinition/706.json b/data/json/SubAchievementDefinition/706.json
index 935bbc75a8746b20cd945524691d61221c5221aa..24b79548a3f97abdb0a4b673a96aafcbe44ec7c6 100644
--- a/data/json/SubAchievementDefinition/706.json
+++ b/data/json/SubAchievementDefinition/706.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 706,
-    "parentDataId": 424,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 424
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Obtenir 500 PQ",
diff --git a/data/json/SubAchievementDefinition/707.json b/data/json/SubAchievementDefinition/707.json
index 30f01f64e608129e6814154f6bc74152cb0865b6..094ff62de6b5a8a4d1d896d71df94542b3f72070 100644
--- a/data/json/SubAchievementDefinition/707.json
+++ b/data/json/SubAchievementDefinition/707.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 707,
-    "parentDataId": 827,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 827
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/709.json b/data/json/SubAchievementDefinition/709.json
index d2b0178d9073b7c9ffb555d92fb1b6eae7b85af7..e2c8b9c1244aef3199ea8f9bb448eb614ebc1264 100644
--- a/data/json/SubAchievementDefinition/709.json
+++ b/data/json/SubAchievementDefinition/709.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 709,
-    "parentDataId": 550,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 550
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Assister au sacrifice d\u0027un Chafer",
diff --git a/data/json/SubAchievementDefinition/710.json b/data/json/SubAchievementDefinition/710.json
index f5a00540dd0aa519f3a346411dbd06d6318e5476..46a1d695a21826940d3b4312cc0bdd2087efca9e 100644
--- a/data/json/SubAchievementDefinition/710.json
+++ b/data/json/SubAchievementDefinition/710.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 710,
-    "parentDataId": 962,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 962
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - [TODO] 15",
diff --git a/data/json/SubAchievementDefinition/714.json b/data/json/SubAchievementDefinition/714.json
index 2fed5893796e1a3e09fa999b7d45fc811980ac6c..8ac6d2291cc138ac5b02dbf7235991b153f479e0 100644
--- a/data/json/SubAchievementDefinition/714.json
+++ b/data/json/SubAchievementDefinition/714.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 714,
-    "parentDataId": 81,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 81
+    },
     "completionThreshold": 50
   },
   "m_displayName": "COCHON - HUB - 04 Remporter 50 Combats",
diff --git a/data/json/SubAchievementDefinition/719.json b/data/json/SubAchievementDefinition/719.json
index 5f3cf32fd6699a476e1799706e007a5f32e47780..aa0fb0e85aea54635320c1ea9bdccbb3ef23b5de 100644
--- a/data/json/SubAchievementDefinition/719.json
+++ b/data/json/SubAchievementDefinition/719.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 719,
-    "parentDataId": 570,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 570
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/72.json b/data/json/SubAchievementDefinition/72.json
index 99fe751020324955d02ea75cda907d943c97206c..cb0c4a7ab4545847e0e7d78f99bddb261c35ed37 100644
--- a/data/json/SubAchievementDefinition/72.json
+++ b/data/json/SubAchievementDefinition/72.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 72,
-    "parentDataId": 526,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 526
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - ARGENT - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/720.json b/data/json/SubAchievementDefinition/720.json
index abccf6962bc21ed44c5d4d71e3ab756549d1316d..e9fedee56f967e0783c4b818d04903d1fa1746b6 100644
--- a/data/json/SubAchievementDefinition/720.json
+++ b/data/json/SubAchievementDefinition/720.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 720,
-    "parentDataId": 555,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 555
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Aider tous les personnages au chapitre 10 en une fois",
diff --git a/data/json/SubAchievementDefinition/723.json b/data/json/SubAchievementDefinition/723.json
index 7c42d87a0e77b98200806583b6eb458cfbe92e07..df9fadbbe946fbdee842287ee2f4f8889b1dd368 100644
--- a/data/json/SubAchievementDefinition/723.json
+++ b/data/json/SubAchievementDefinition/723.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 723,
-    "parentDataId": 284,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 284
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - ARGENT - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/7232.json b/data/json/SubAchievementDefinition/7232.json
index 6dd78145efb809658f87018b8b8ca13819ff9a7b..d6bf8139c732211ae7d85761eae7e4535710ff51 100644
--- a/data/json/SubAchievementDefinition/7232.json
+++ b/data/json/SubAchievementDefinition/7232.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 7232,
-    "parentDataId": 684,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 684
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - DONJON - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/724.json b/data/json/SubAchievementDefinition/724.json
index b382eb1c8e86e5f13a50487ab8a0dc44d8345d7b..3268746d264d99c4f1d7970c32825acce7f686fe 100644
--- a/data/json/SubAchievementDefinition/724.json
+++ b/data/json/SubAchievementDefinition/724.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 724,
-    "parentDataId": 909,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 909
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 25 Achever le Chevalier de Parme avec Cochonnette et gagner le combat",
diff --git a/data/json/SubAchievementDefinition/725.json b/data/json/SubAchievementDefinition/725.json
index 39d9810e728928694104748ec02041afb9517096..4b820e698225179ce67ba0e442e4d27e02c3fe57 100644
--- a/data/json/SubAchievementDefinition/725.json
+++ b/data/json/SubAchievementDefinition/725.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 725,
-    "parentDataId": 325,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 325
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/727.json b/data/json/SubAchievementDefinition/727.json
index 420947f90f8fbc24ffeac2707457a5b1743a4d12..ce918ddf5e573b54cf872f066f00397b4d11ea76 100644
--- a/data/json/SubAchievementDefinition/727.json
+++ b/data/json/SubAchievementDefinition/727.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 727,
-    "parentDataId": 455,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 455
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 15 Run Complète Chap. X",
diff --git a/data/json/SubAchievementDefinition/728.json b/data/json/SubAchievementDefinition/728.json
index dcfb1fb339da3bae802f8d6b8df662458db75ebf..c70411de536dc52c0b6b67c0a837b179321bbe2b 100644
--- a/data/json/SubAchievementDefinition/728.json
+++ b/data/json/SubAchievementDefinition/728.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 728,
-    "parentDataId": 129,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 129
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Vaincre un Gro Bwork avec plus de 5 PM",
diff --git a/data/json/SubAchievementDefinition/73.json b/data/json/SubAchievementDefinition/73.json
index 312a2544a33af111b8ab7e6951f9779343bbc2be..10191810ee30f551d47fc40b02645afa33701f52 100644
--- a/data/json/SubAchievementDefinition/73.json
+++ b/data/json/SubAchievementDefinition/73.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 73,
-    "parentDataId": 801,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 801
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/730.json b/data/json/SubAchievementDefinition/730.json
index 4902f4a63d1de2370e7d54edcceb8e33d8e111fb..9b4e6a316036502ab5f3eec0db5cff6191bbf2d0 100644
--- a/data/json/SubAchievementDefinition/730.json
+++ b/data/json/SubAchievementDefinition/730.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 730,
-    "parentDataId": 300,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 300
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - OR - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/733.json b/data/json/SubAchievementDefinition/733.json
index 08bfb0c3149b85a98ae02ae1ceb96efe3c1ea077..286f6f31ef4111fe83f3d656641cc97f611891a9 100644
--- a/data/json/SubAchievementDefinition/733.json
+++ b/data/json/SubAchievementDefinition/733.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 733,
-    "parentDataId": 283,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 283
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - DONJON - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/737.json b/data/json/SubAchievementDefinition/737.json
index 5dc5912aa3a348d165cfb84d178e8286b0563848..dcfda96dd29c63b78d328861222d70e816d2efba 100644
--- a/data/json/SubAchievementDefinition/737.json
+++ b/data/json/SubAchievementDefinition/737.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 737,
-    "parentDataId": 612,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 612
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Aider le PNJ 1",
diff --git a/data/json/SubAchievementDefinition/738.json b/data/json/SubAchievementDefinition/738.json
index 558a28e70c1dbb6fedcb4a3e80512f5e8b8b4c45..7a7c95c44202275cf6c69bbbd061a7aaeda82603 100644
--- a/data/json/SubAchievementDefinition/738.json
+++ b/data/json/SubAchievementDefinition/738.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 738,
-    "parentDataId": 405,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 405
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - Remporter un combat sans enrager plus d\u0027un Bwork par tour",
diff --git a/data/json/SubAchievementDefinition/739.json b/data/json/SubAchievementDefinition/739.json
index cf77d4b5a73b8f8f58deb223e35351446dc37067..9631e1b67af32ba81646dd48cf76ef2b50a2e1df 100644
--- a/data/json/SubAchievementDefinition/739.json
+++ b/data/json/SubAchievementDefinition/739.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 739,
-    "parentDataId": 753,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 753
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - III",
diff --git a/data/json/SubAchievementDefinition/74.json b/data/json/SubAchievementDefinition/74.json
index ee3d0d89300f3feff5f0dda8207a6cd65a1e8564..39a7f44ba77bf01ceacca4a217174fc5fe22558a 100644
--- a/data/json/SubAchievementDefinition/74.json
+++ b/data/json/SubAchievementDefinition/74.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 74,
-    "parentDataId": 112,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 112
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/740.json b/data/json/SubAchievementDefinition/740.json
index 112ec371d2f9fc6a0eb882c9c6431fecb9a756db..d2d8831f86504fb9c9b05a46128f1451f54abb02 100644
--- a/data/json/SubAchievementDefinition/740.json
+++ b/data/json/SubAchievementDefinition/740.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 740,
-    "parentDataId": 726,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 726
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BOUFTOU - HUB - Remporter 100 combats",
diff --git a/data/json/SubAchievementDefinition/741.json b/data/json/SubAchievementDefinition/741.json
index eb5b28478dd38442befe3818144ad110adf52a11..d32441c6ff4b120b37cf16b23658908ee12083a2 100644
--- a/data/json/SubAchievementDefinition/741.json
+++ b/data/json/SubAchievementDefinition/741.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 741,
-    "parentDataId": 369,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 369
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/742.json b/data/json/SubAchievementDefinition/742.json
index 30087dc18012902ee8c987e763e63957865114bf..637f8ed818231992b1ddf89d1b623fb8f46dfcec 100644
--- a/data/json/SubAchievementDefinition/742.json
+++ b/data/json/SubAchievementDefinition/742.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 742,
-    "parentDataId": 711,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 711
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Run complète",
diff --git a/data/json/SubAchievementDefinition/743.json b/data/json/SubAchievementDefinition/743.json
index 5569cb474566c6a40d5a5624c1ef5defcaa11f2a..939796aeffa84295c77a5c04299714c0850466f1 100644
--- a/data/json/SubAchievementDefinition/743.json
+++ b/data/json/SubAchievementDefinition/743.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 743,
-    "parentDataId": 80,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 80
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Avoir plus de 10 PUPUCES sur le terrain",
diff --git a/data/json/SubAchievementDefinition/752.json b/data/json/SubAchievementDefinition/752.json
index 27d3cb7ac16941e488588c72033d29657f189de3..054c9c2dc26b90f489630b9479267e464035494e 100644
--- a/data/json/SubAchievementDefinition/752.json
+++ b/data/json/SubAchievementDefinition/752.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 752,
-    "parentDataId": 389,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 389
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - Terminer le donjon en coop",
diff --git a/data/json/SubAchievementDefinition/753.json b/data/json/SubAchievementDefinition/753.json
index 82506d5773fc8be8b990fbd042a1d7f47df69729..4d8f37d3be64417bedef29e50f5904c41f096a45 100644
--- a/data/json/SubAchievementDefinition/753.json
+++ b/data/json/SubAchievementDefinition/753.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 753,
-    "parentDataId": 151,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 151
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BOUFTOU - HUB - Subir 100 MALADIES",
diff --git a/data/json/SubAchievementDefinition/754.json b/data/json/SubAchievementDefinition/754.json
index dbf4800f0cb2841e19b40993a148b637ab469b3b..1cd2f3ddfab557065997875496dfaa88c259e70b 100644
--- a/data/json/SubAchievementDefinition/754.json
+++ b/data/json/SubAchievementDefinition/754.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 754,
-    "parentDataId": 783,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 783
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Vaincre un BOUFTOU ADULTE avant qu\u0027il n\u0027augmente son AT",
diff --git a/data/json/SubAchievementDefinition/755.json b/data/json/SubAchievementDefinition/755.json
index 006dd954450095a72135f14cce79d8be4134b87a..d930ff0e87832b15274665b8c21f1a62e0a2eb0b 100644
--- a/data/json/SubAchievementDefinition/755.json
+++ b/data/json/SubAchievementDefinition/755.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 755,
-    "parentDataId": 359,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 359
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - ARGENT - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/759.json b/data/json/SubAchievementDefinition/759.json
index 539d469637845621dfd4c35e0ea0f9bcffa8bd65..0f8b3ca9733113c212d203fb665b3b7fa63ed5fb 100644
--- a/data/json/SubAchievementDefinition/759.json
+++ b/data/json/SubAchievementDefinition/759.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 759,
-    "parentDataId": 309,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 309
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - HUB - 10 Achever un Guerrier Boudeur après avoir subit au moins 10 fois son attaque",
diff --git a/data/json/SubAchievementDefinition/760.json b/data/json/SubAchievementDefinition/760.json
index 6dce45b8b4f95049f390d23241274c864dfaac98..fb29707389080b12e2128cb39e098131e734d769 100644
--- a/data/json/SubAchievementDefinition/760.json
+++ b/data/json/SubAchievementDefinition/760.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 760,
-    "parentDataId": 465,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 465
+    },
     "completionThreshold": 20
   },
   "m_displayName": "COCHON - Dungeon - 14 Terminer 20 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/761.json b/data/json/SubAchievementDefinition/761.json
index 743905afb17d88e5d4df860deda783a59edf352b..fed79786f93c688696fcc0c04842c42aeb53cc34 100644
--- a/data/json/SubAchievementDefinition/761.json
+++ b/data/json/SubAchievementDefinition/761.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 761,
-    "parentDataId": 305,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 305
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Vaincre le Pinspoteur avec plus de 100 AT",
diff --git a/data/json/SubAchievementDefinition/762.json b/data/json/SubAchievementDefinition/762.json
index f4e7eb5190d76d2af7d679452518655763a8065b..66137e20278ea1cf1002b1441053dc52f595209d 100644
--- a/data/json/SubAchievementDefinition/762.json
+++ b/data/json/SubAchievementDefinition/762.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 762,
-    "parentDataId": 254,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 254
+    },
     "completionThreshold": 500
   },
   "m_displayName": "COCHON - HUB - 03 Vaincre 500 Cochons",
diff --git a/data/json/SubAchievementDefinition/763.json b/data/json/SubAchievementDefinition/763.json
index d4779cc8da19ec9b0238dfb0084ec5127695aa85..e2f6e0f8bbab49e01355d437b8a7a13fda1be660 100644
--- a/data/json/SubAchievementDefinition/763.json
+++ b/data/json/SubAchievementDefinition/763.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 763,
-    "parentDataId": 626,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 626
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - Subir 5 explosions ou plus en un seul tour",
diff --git a/data/json/SubAchievementDefinition/765.json b/data/json/SubAchievementDefinition/765.json
index 160921ce04cc1ef84e41abd0d60b56cbec8779bb..9977605564a66491e5cfcbd3af36c4c33ce5fc86 100644
--- a/data/json/SubAchievementDefinition/765.json
+++ b/data/json/SubAchievementDefinition/765.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 765,
-    "parentDataId": 328,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 328
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - OR - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/773.json b/data/json/SubAchievementDefinition/773.json
index 95ee1bc82ab49c70c08d000d3ffd3bbb2a224fab..b469eaa4a5fad3227bf32374fd877d7127c8d379 100644
--- a/data/json/SubAchievementDefinition/773.json
+++ b/data/json/SubAchievementDefinition/773.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 773,
-    "parentDataId": 440,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 440
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Achievement 4",
diff --git a/data/json/SubAchievementDefinition/776.json b/data/json/SubAchievementDefinition/776.json
index 6297c5536aa236cd4e573410a8aa4edafb4563bd..bdb04e9171c6b4c55169be7ea0eb565a4fe72b73 100644
--- a/data/json/SubAchievementDefinition/776.json
+++ b/data/json/SubAchievementDefinition/776.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 776,
-    "parentDataId": 668,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 668
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - BRONZE - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/778.json b/data/json/SubAchievementDefinition/778.json
index 8ec899000cb45c3079ccf80a891a3a4b218ec6f5..a449e9958d48ff502aa1e8df6caeaedc9bd5a2e0 100644
--- a/data/json/SubAchievementDefinition/778.json
+++ b/data/json/SubAchievementDefinition/778.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 778,
-    "parentDataId": 436,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 436
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Terminer le donjon en coop",
diff --git a/data/json/SubAchievementDefinition/782.json b/data/json/SubAchievementDefinition/782.json
index 3d0b36be9a0bfedff671a46cca0f0137a43776a1..1829d63b1efab1e69667eae97905e0d6bffb080d 100644
--- a/data/json/SubAchievementDefinition/782.json
+++ b/data/json/SubAchievementDefinition/782.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 782,
-    "parentDataId": 917,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 917
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/783.json b/data/json/SubAchievementDefinition/783.json
index 638798aaf12cfec70c60a0622b3d3b80931281e3..e255b6869c5156c3fb26d6ae8cfa5d4c556e4f92 100644
--- a/data/json/SubAchievementDefinition/783.json
+++ b/data/json/SubAchievementDefinition/783.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 783,
-    "parentDataId": 474,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 474
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/785.json b/data/json/SubAchievementDefinition/785.json
index 22ce28840f111e762c7fe6adba01e435df72c2ed..817b3678b3300914bc3f1246c2283e5b059d4230 100644
--- a/data/json/SubAchievementDefinition/785.json
+++ b/data/json/SubAchievementDefinition/785.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 785,
-    "parentDataId": 2172,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2172
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/786.json b/data/json/SubAchievementDefinition/786.json
index b9daad702d540eccfc38b5afd86a16d5d5d715b5..a22f2a76a6ef110f398c7d6f969765e5a509dd4d 100644
--- a/data/json/SubAchievementDefinition/786.json
+++ b/data/json/SubAchievementDefinition/786.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 786,
-    "parentDataId": 849,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 849
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Achever une Tofoune en dernier",
diff --git a/data/json/SubAchievementDefinition/787.json b/data/json/SubAchievementDefinition/787.json
index 2827dea063084a02c065bf86daef54d6e5255bc5..046b813322f6ff66f5cef6d338cdbfdc7d25aa53 100644
--- a/data/json/SubAchievementDefinition/787.json
+++ b/data/json/SubAchievementDefinition/787.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 787,
-    "parentDataId": 995,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 995
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 4",
diff --git a/data/json/SubAchievementDefinition/788.json b/data/json/SubAchievementDefinition/788.json
index 7958724f7bcd24cf0a6bb0fbb25a65b46fd9d977..f125af5dc17e3f12e957cd548c458fbff54d7b08 100644
--- a/data/json/SubAchievementDefinition/788.json
+++ b/data/json/SubAchievementDefinition/788.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 788,
-    "parentDataId": 494,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 494
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/79.json b/data/json/SubAchievementDefinition/79.json
index 846c316ef1528dcd9a80369b5b49f16db443f505..708641527dd2d1ba353d960a3a8de418c9420f41 100644
--- a/data/json/SubAchievementDefinition/79.json
+++ b/data/json/SubAchievementDefinition/79.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 79,
-    "parentDataId": 575,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 575
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Run complète",
diff --git a/data/json/SubAchievementDefinition/792.json b/data/json/SubAchievementDefinition/792.json
index ac326033c639f6938ee77ae94e7378141d9991ea..6f4fea365627b785fa684be77aba9543372f1631 100644
--- a/data/json/SubAchievementDefinition/792.json
+++ b/data/json/SubAchievementDefinition/792.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 792,
-    "parentDataId": 168,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 168
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Achever un adversaire avec Creuzar",
diff --git a/data/json/SubAchievementDefinition/793.json b/data/json/SubAchievementDefinition/793.json
index acdea6574050b89595bddcea3c8af09a414ab3dd..8648532a6deba03e3c4db106bdd4e71df1ceafc9 100644
--- a/data/json/SubAchievementDefinition/793.json
+++ b/data/json/SubAchievementDefinition/793.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 793,
-    "parentDataId": 99,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 99
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - (WIP - Spécifique 1)",
diff --git a/data/json/SubAchievementDefinition/794.json b/data/json/SubAchievementDefinition/794.json
index c75c3da55a4c365e5b153ea347f5d915591a5885..fdf8c42effa8a6d89c8a86a918d98cbb463e5e14 100644
--- a/data/json/SubAchievementDefinition/794.json
+++ b/data/json/SubAchievementDefinition/794.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 794,
-    "parentDataId": 273,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 273
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 24 Vaincre le Chevalier de Parme en premier",
diff --git a/data/json/SubAchievementDefinition/795.json b/data/json/SubAchievementDefinition/795.json
index 6f9ca5586db98f96ff951bbb9e49aab04ffd9e67..f42e733e4dcfbe4bd4710a0c761799933de9e471 100644
--- a/data/json/SubAchievementDefinition/795.json
+++ b/data/json/SubAchievementDefinition/795.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 795,
-    "parentDataId": 357,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 357
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - OR - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/800.json b/data/json/SubAchievementDefinition/800.json
index 33a810ad2ba554ef25e03ae7a557ae7ba936ca72..031bbf1685c1fec5cf8999ff7c944ba4cb603247 100644
--- a/data/json/SubAchievementDefinition/800.json
+++ b/data/json/SubAchievementDefinition/800.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 800,
-    "parentDataId": 642,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 642
+    },
     "completionThreshold": 100
   },
   "m_displayName": "BWORK - Hub - Vaincre 100 Bworks",
diff --git a/data/json/SubAchievementDefinition/802.json b/data/json/SubAchievementDefinition/802.json
index 1bfa4ffeec41e1a7cc02236346f178613f1c2a50..1c846fe818cd699104a484da6399e3403f18cd53 100644
--- a/data/json/SubAchievementDefinition/802.json
+++ b/data/json/SubAchievementDefinition/802.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 802,
-    "parentDataId": 302,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 302
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - HUB - 13 Se faire repousser de 10 cases ou plus en un seul combat",
diff --git a/data/json/SubAchievementDefinition/803.json b/data/json/SubAchievementDefinition/803.json
index f01c2bd7f2338b8271516333268ea81ea42ec80b..1c4bcd2abac914109539c4f3bc88cf5f4e8144aa 100644
--- a/data/json/SubAchievementDefinition/803.json
+++ b/data/json/SubAchievementDefinition/803.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 803,
-    "parentDataId": 501,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 501
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Aider le PNJ 2",
diff --git a/data/json/SubAchievementDefinition/804.json b/data/json/SubAchievementDefinition/804.json
index 9c63708ad8fea8d74a46fae9da1226dd0e1e7b42..247081efae44f46d21fab90ddbef49572e6e234f 100644
--- a/data/json/SubAchievementDefinition/804.json
+++ b/data/json/SubAchievementDefinition/804.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 804,
-    "parentDataId": 887,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 887
+    },
     "completionThreshold": 30
   },
   "m_displayName": "BOUFTOU - Q03 - Avoir vaincu 30 sbires du clan 2",
diff --git a/data/json/SubAchievementDefinition/808.json b/data/json/SubAchievementDefinition/808.json
index f91941ee5f313b7fb1944de3d30797a534c65767..e0f3a081c603cc6d6fc2b9638e7bdacab886500a 100644
--- a/data/json/SubAchievementDefinition/808.json
+++ b/data/json/SubAchievementDefinition/808.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 808,
-    "parentDataId": 237,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 237
+    },
     "completionThreshold": 50
   },
   "m_displayName": "CHAFER - Hub - Remporter 50 combats",
diff --git a/data/json/SubAchievementDefinition/809.json b/data/json/SubAchievementDefinition/809.json
index 7b9f7dd8bfd1d4381d6dfa1ee30439030733dc5b..a0cac7dc6f16621994a1556d4d121781333b585a 100644
--- a/data/json/SubAchievementDefinition/809.json
+++ b/data/json/SubAchievementDefinition/809.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 809,
-    "parentDataId": 14,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 14
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/811.json b/data/json/SubAchievementDefinition/811.json
index 40989a9fdb0e4c96cd999b40d5b91654c1ffb556..d1b3fd2da1cac0ad6dd31a33328430a887be4019 100644
--- a/data/json/SubAchievementDefinition/811.json
+++ b/data/json/SubAchievementDefinition/811.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 811,
-    "parentDataId": 864,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 864
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 9",
diff --git a/data/json/SubAchievementDefinition/812.json b/data/json/SubAchievementDefinition/812.json
index de9b06a5b5c6c48695865d2f75160c3ce90c22ea..cef7aedc4d74e30a3f75417806c2d44d2b1f4a70 100644
--- a/data/json/SubAchievementDefinition/812.json
+++ b/data/json/SubAchievementDefinition/812.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 812,
-    "parentDataId": 68,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 68
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/813.json b/data/json/SubAchievementDefinition/813.json
index 79488c6f8191c433a54162d0ef33649211e1566e..5c665d63728fcb66fee1becd0b2af3e22441be4c 100644
--- a/data/json/SubAchievementDefinition/813.json
+++ b/data/json/SubAchievementDefinition/813.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 813,
-    "parentDataId": 999,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 999
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - ARGENT - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/815.json b/data/json/SubAchievementDefinition/815.json
index 4399ad6780f2d86cc114357d4bc904087765c837..d65998a4f7ab1f3752ab5f098e189cc43528362f 100644
--- a/data/json/SubAchievementDefinition/815.json
+++ b/data/json/SubAchievementDefinition/815.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 815,
-    "parentDataId": 66,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 66
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - BRONZE - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/816.json b/data/json/SubAchievementDefinition/816.json
index 086f4106ec30dea772aa752803641106419e71f8..a5c96d0a8aec3c9c832aba5943b55fd86853abf7 100644
--- a/data/json/SubAchievementDefinition/816.json
+++ b/data/json/SubAchievementDefinition/816.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 816,
-    "parentDataId": 701,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 701
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - BRONZE - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/817.json b/data/json/SubAchievementDefinition/817.json
index e695561099bd67ac0a7d6131b26418851e0ecca4..6a4ff33a40720d58291439d078f6447cc719d310 100644
--- a/data/json/SubAchievementDefinition/817.json
+++ b/data/json/SubAchievementDefinition/817.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 817,
-    "parentDataId": 977,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 977
+    },
     "completionThreshold": 50
   },
   "m_displayName": "BOUFTOU - DONJON - Réussir 50 challenges en donjon",
diff --git a/data/json/SubAchievementDefinition/818.json b/data/json/SubAchievementDefinition/818.json
index 12270a1410441f6ad895ab134b13e33af19d9570..22d9489f32f6c71e009d5db3163b6d8bce23ca85 100644
--- a/data/json/SubAchievementDefinition/818.json
+++ b/data/json/SubAchievementDefinition/818.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 818,
-    "parentDataId": 745,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 745
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - VI",
diff --git a/data/json/SubAchievementDefinition/82.json b/data/json/SubAchievementDefinition/82.json
index c98e08d2cde437eb2fc15a2b1fee6c43befff965..75dea83dfa014fe91eec871d6b61784196b1897f 100644
--- a/data/json/SubAchievementDefinition/82.json
+++ b/data/json/SubAchievementDefinition/82.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 82,
-    "parentDataId": 367,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 367
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - BRONZE - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/822.json b/data/json/SubAchievementDefinition/822.json
index bcb983f6624f763ba3f7155ac02f65bb1af9c9a5..c6580c1ab115aebab56d3c3d54c3726afb95cd62 100644
--- a/data/json/SubAchievementDefinition/822.json
+++ b/data/json/SubAchievementDefinition/822.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 822,
-    "parentDataId": 24,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 24
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - HUB - 11 Subir un Critique de plus de 150 dégâts",
diff --git a/data/json/SubAchievementDefinition/823.json b/data/json/SubAchievementDefinition/823.json
index aa6a2e29d1f9f287da3d8a89d9d5d2affc0dbcf0..a961211c330fd08be66251e9a5c7c3dc1df467a5 100644
--- a/data/json/SubAchievementDefinition/823.json
+++ b/data/json/SubAchievementDefinition/823.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 823,
-    "parentDataId": 998,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 998
+    },
     "completionThreshold": 10
   },
   "m_displayName": "BOUFTOU - DONJON - Terminer 10 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/824.json b/data/json/SubAchievementDefinition/824.json
index 3a4048756788dc6c33b5ea8b72c0ceb0d4d98f42..ce7665e50e330512da2a4556e56d31456e5afe4b 100644
--- a/data/json/SubAchievementDefinition/824.json
+++ b/data/json/SubAchievementDefinition/824.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 824,
-    "parentDataId": 529,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 529
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Réduire l\u0027AT d\u0027un Bouftou à 0 avec le Dr. Teigne",
diff --git a/data/json/SubAchievementDefinition/826.json b/data/json/SubAchievementDefinition/826.json
index 4d0b731fac5494eeda59b4750a9a697027e04027..dff09690e7533739cf058b3b2d65749ca4d801a0 100644
--- a/data/json/SubAchievementDefinition/826.json
+++ b/data/json/SubAchievementDefinition/826.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 826,
-    "parentDataId": 946,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 946
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Subir 4 sorts ou plus en un seul tour",
diff --git a/data/json/SubAchievementDefinition/830.json b/data/json/SubAchievementDefinition/830.json
index 6e3bfa53cc929259915eabc28d3126635ad096bf..01dd7b28e52476fc17f694fd3cb8d533863bd64a 100644
--- a/data/json/SubAchievementDefinition/830.json
+++ b/data/json/SubAchievementDefinition/830.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 830,
-    "parentDataId": 471,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 471
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/832.json b/data/json/SubAchievementDefinition/832.json
index 1684cd14b15922e756ad3611bdac953968b8b959..361bff269c3b172bc950115f317601554aad3460 100644
--- a/data/json/SubAchievementDefinition/832.json
+++ b/data/json/SubAchievementDefinition/832.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 832,
-    "parentDataId": 829,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 829
+    },
     "completionThreshold": 20
   },
   "m_displayName": "CHUCHOTEUR - Q01 - 11 Réussir 20 combats",
diff --git a/data/json/SubAchievementDefinition/834.json b/data/json/SubAchievementDefinition/834.json
index 45266bbf5dfa989039fdb8bf5bb02033690839c6..a56947b32b0b249b84dc7ac10d4ed3d788970b7f 100644
--- a/data/json/SubAchievementDefinition/834.json
+++ b/data/json/SubAchievementDefinition/834.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 834,
-    "parentDataId": 584,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 584
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/835.json b/data/json/SubAchievementDefinition/835.json
index 6ebd9a874d6033064444ce5c81f3ffe077bc0d25..c03cf21cb5e0ca305650987055e8087158316b7f 100644
--- a/data/json/SubAchievementDefinition/835.json
+++ b/data/json/SubAchievementDefinition/835.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 835,
-    "parentDataId": 741,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 741
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/836.json b/data/json/SubAchievementDefinition/836.json
index bb2534c2a487ce2e0b0644f76b437f2ff0a01c33..0d436cf30d14302980437f98c9c066b00b2d8d2b 100644
--- a/data/json/SubAchievementDefinition/836.json
+++ b/data/json/SubAchievementDefinition/836.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 836,
-    "parentDataId": 437,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 437
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 20 Vaincre l\u0027Impératrice en première",
diff --git a/data/json/SubAchievementDefinition/838.json b/data/json/SubAchievementDefinition/838.json
index efba05e0b4436b0894c8013a7502404ffcb63449..4aa0cb65347e505ec35675337c32614bb386afbd 100644
--- a/data/json/SubAchievementDefinition/838.json
+++ b/data/json/SubAchievementDefinition/838.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 838,
-    "parentDataId": 487,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 487
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Faire tomber 3 Tofus ou plus en un seul tour",
diff --git a/data/json/SubAchievementDefinition/839.json b/data/json/SubAchievementDefinition/839.json
index e4f3e5373bcccb9335d1df956cb9ed8f340d9a48..174acb9540d776c3a08a1004620885386a08fc66 100644
--- a/data/json/SubAchievementDefinition/839.json
+++ b/data/json/SubAchievementDefinition/839.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 839,
-    "parentDataId": 937,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 937
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - ARGENT - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/84.json b/data/json/SubAchievementDefinition/84.json
index 322febed8011c9e19c7ad8d8f80b96f8ea79f2f5..e5c8e273d9ce7fcb24c71966af6282b5cebdd221 100644
--- a/data/json/SubAchievementDefinition/84.json
+++ b/data/json/SubAchievementDefinition/84.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 84,
-    "parentDataId": 840,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 840
+    },
     "completionThreshold": 500
   },
   "m_displayName": "TOFU - Hub - Vaincre 500 Tofus",
diff --git a/data/json/SubAchievementDefinition/840.json b/data/json/SubAchievementDefinition/840.json
index 7de5ce7f3d0fba23822a8026b2d3264ad995acc8..463d38f3bc3095e6c4c79c07df25e39d6b3e04d1 100644
--- a/data/json/SubAchievementDefinition/840.json
+++ b/data/json/SubAchievementDefinition/840.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 840,
-    "parentDataId": 549,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 549
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 17 Aider les Fantassins à repousser le Chevalier Noir",
diff --git a/data/json/SubAchievementDefinition/841.json b/data/json/SubAchievementDefinition/841.json
index 560133f30a787bd9bbea818e666be0cdb69e7715..01ed62f6e75662b3924b7f3509fb1082f91a19bc 100644
--- a/data/json/SubAchievementDefinition/841.json
+++ b/data/json/SubAchievementDefinition/841.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 841,
-    "parentDataId": 301,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 301
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/842.json b/data/json/SubAchievementDefinition/842.json
index 17c4f3c63d871a930a8cbba0f7bbbab4e26d5ff4..bc6e5c46ad33a470af37225542dc9037d1021b3c 100644
--- a/data/json/SubAchievementDefinition/842.json
+++ b/data/json/SubAchievementDefinition/842.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 842,
-    "parentDataId": 862,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 862
+    },
     "completionThreshold": 5
   },
   "m_displayName": "BWORK - Dungeon - OR - Vaincre 5 boss avant son garde du corps",
diff --git a/data/json/SubAchievementDefinition/844.json b/data/json/SubAchievementDefinition/844.json
index b2d599a06c7e6015f4d77ddc8aa99e5f7987059c..bab441938bae7741d686b84968c5d11a288098a8 100644
--- a/data/json/SubAchievementDefinition/844.json
+++ b/data/json/SubAchievementDefinition/844.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 844,
-    "parentDataId": 481,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 481
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - I",
diff --git a/data/json/SubAchievementDefinition/846.json b/data/json/SubAchievementDefinition/846.json
index 02051ffb9687c0fda7cdf354a77286a5f4489285..1d76a38885b9a2d285fe463a55f384f013872378 100644
--- a/data/json/SubAchievementDefinition/846.json
+++ b/data/json/SubAchievementDefinition/846.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 846,
-    "parentDataId": 940,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 940
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - HUB - 12 Achever un Instructeur Cochon en dernier",
diff --git a/data/json/SubAchievementDefinition/847.json b/data/json/SubAchievementDefinition/847.json
index b7fb4fbfc2210f4797248b8aa06fe9153de062a9..e1c054893fc84aac204555db96b07ac58e469dc5 100644
--- a/data/json/SubAchievementDefinition/847.json
+++ b/data/json/SubAchievementDefinition/847.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 847,
-    "parentDataId": 336,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 336
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Vaincre une BOUFLONNE enceinte",
diff --git a/data/json/SubAchievementDefinition/849.json b/data/json/SubAchievementDefinition/849.json
index bdb37f9ca8d543a099be9ca4a832aa9c2cf338a5..0f82be316d2a3f95ee08afb5ee6dce769cf8a167 100644
--- a/data/json/SubAchievementDefinition/849.json
+++ b/data/json/SubAchievementDefinition/849.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 849,
-    "parentDataId": 588,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 588
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - ARGENT - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/851.json b/data/json/SubAchievementDefinition/851.json
index a07232c203a9f345a9ad73ed4e643f47a7537909..95cd3a57dfb3c363ddbed4a8df9b084b84e1ed11 100644
--- a/data/json/SubAchievementDefinition/851.json
+++ b/data/json/SubAchievementDefinition/851.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 851,
-    "parentDataId": 551,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 551
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 2",
diff --git a/data/json/SubAchievementDefinition/852.json b/data/json/SubAchievementDefinition/852.json
index d4ad9b31a532d36b1428b664840b4ab73af592ad..f7f34535436d9ec9ad94c5f3ba74386218cd8d4f 100644
--- a/data/json/SubAchievementDefinition/852.json
+++ b/data/json/SubAchievementDefinition/852.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 852,
-    "parentDataId": 580,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 580
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - ARGENT - Terminer tour au bord du plateau",
diff --git a/data/json/SubAchievementDefinition/853.json b/data/json/SubAchievementDefinition/853.json
index 2d07a5e2cc2ed02933388a824d31d8c877fc6038..9cede415498a1627f28ab044aa0c347212e1e57b 100644
--- a/data/json/SubAchievementDefinition/853.json
+++ b/data/json/SubAchievementDefinition/853.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 853,
-    "parentDataId": 0,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 890
+    },
     "completionThreshold": 15
   },
   "m_displayName": "CHAFER - Hub - Détruire 15 Tombes Maudites",
diff --git a/data/json/SubAchievementDefinition/854.json b/data/json/SubAchievementDefinition/854.json
index 40e446b6b43e07870d3e97ed089b34bc41e24fa1..1b093554e42274a03d7a36f0d2876fa58cf78059 100644
--- a/data/json/SubAchievementDefinition/854.json
+++ b/data/json/SubAchievementDefinition/854.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 854,
-    "parentDataId": 13,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 13
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - OR - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/855.json b/data/json/SubAchievementDefinition/855.json
index dbda594700c4fdc76dab4419717b6bca236d9027..5c280fe86f7dbfc5f998f58496026e11dc193d9d 100644
--- a/data/json/SubAchievementDefinition/855.json
+++ b/data/json/SubAchievementDefinition/855.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 855,
-    "parentDataId": 346,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 346
+    },
     "completionThreshold": 25
   },
   "m_displayName": "BWORK - Hub - Subir 25 Flaques de lave",
diff --git a/data/json/SubAchievementDefinition/856.json b/data/json/SubAchievementDefinition/856.json
index 7720ec99606d6766bc41736fe0e38d896bffbc43..b4765a8d2677618e5811207654379fdab4f5ad22 100644
--- a/data/json/SubAchievementDefinition/856.json
+++ b/data/json/SubAchievementDefinition/856.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 856,
-    "parentDataId": 219,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 219
+    },
     "completionThreshold": 250
   },
   "m_displayName": "CHUCHOTEUR - HUB - 02 Vaincre 250 Chucho",
diff --git a/data/json/SubAchievementDefinition/857.json b/data/json/SubAchievementDefinition/857.json
index cb641c9ba09364eec351e4b08d18795133ecb8c5..ea3d4b6d9b1402bea7a2cfd38d888ad86f0a782d 100644
--- a/data/json/SubAchievementDefinition/857.json
+++ b/data/json/SubAchievementDefinition/857.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 857,
-    "parentDataId": 712,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 712
+    },
     "completionThreshold": 30
   },
   "m_displayName": "COCHON - Q03 - 12 Vaincre 30 Sbires du Clan Ninja",
diff --git a/data/json/SubAchievementDefinition/858.json b/data/json/SubAchievementDefinition/858.json
index 6b23603690f26014863d52184b7059cf30e01dfd..3442e181fcc3a1aaf1fc2eab7acb1d6be40f958d 100644
--- a/data/json/SubAchievementDefinition/858.json
+++ b/data/json/SubAchievementDefinition/858.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 858,
-    "parentDataId": 415,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 415
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - ARGENT - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/859.json b/data/json/SubAchievementDefinition/859.json
index 7554b0346ab1794b50ab4cfbe8a3fa30c81a5bc4..50bb985862aff607ac70a3b408c5403b85097d70 100644
--- a/data/json/SubAchievementDefinition/859.json
+++ b/data/json/SubAchievementDefinition/859.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 859,
-    "parentDataId": 725,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 725
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CRAQUELEUR - Q01 - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/861.json b/data/json/SubAchievementDefinition/861.json
index b252864ac06cfa5ff9da544266b8fa765f1c90a0..dad56df552f77a3bd920fea9be040c88b66a542e 100644
--- a/data/json/SubAchievementDefinition/861.json
+++ b/data/json/SubAchievementDefinition/861.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 861,
-    "parentDataId": 400,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 400
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - ARGENT - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/862.json b/data/json/SubAchievementDefinition/862.json
index 1ada6c26b4c0489ab20c60901f619196c5a2d36f..2eed154a5cc00cb554f3ebc9f45310d79bc02173 100644
--- a/data/json/SubAchievementDefinition/862.json
+++ b/data/json/SubAchievementDefinition/862.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 862,
-    "parentDataId": 496,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 496
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/863.json b/data/json/SubAchievementDefinition/863.json
index 462769545180d5bf91decdafc9bbb14932399aa7..fe3da8a4c855a5cd7de92b84ab4516e8753fb4e4 100644
--- a/data/json/SubAchievementDefinition/863.json
+++ b/data/json/SubAchievementDefinition/863.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 863,
-    "parentDataId": 848,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 848
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Vaincre Bworky Pro Graisse",
diff --git a/data/json/SubAchievementDefinition/87.json b/data/json/SubAchievementDefinition/87.json
index 63a85611f05155d3ce0e0948996f385ecd4e373e..932198f694438964f15b95e6087ed668a4488da0 100644
--- a/data/json/SubAchievementDefinition/87.json
+++ b/data/json/SubAchievementDefinition/87.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 87,
-    "parentDataId": 293,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 293
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 10",
diff --git a/data/json/SubAchievementDefinition/872.json b/data/json/SubAchievementDefinition/872.json
index 649b8a27aaaed073df8e74980422cf9e8a3a0046..208cb65d334302a1b332c5ca361944be730aa0dc 100644
--- a/data/json/SubAchievementDefinition/872.json
+++ b/data/json/SubAchievementDefinition/872.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 872,
-    "parentDataId": 335,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 335
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - II",
diff --git a/data/json/SubAchievementDefinition/873.json b/data/json/SubAchievementDefinition/873.json
index 091dabbec875b7c1f2e30d958ad2017deb5cc016..988436b60130719ab48d4ef94fc0755fb8a7d7d0 100644
--- a/data/json/SubAchievementDefinition/873.json
+++ b/data/json/SubAchievementDefinition/873.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 873,
-    "parentDataId": 785,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 785
+    },
     "completionThreshold": 10
   },
   "m_displayName": "COCHON - Q01 - 14 Subir 10 auras Padma",
diff --git a/data/json/SubAchievementDefinition/875.json b/data/json/SubAchievementDefinition/875.json
index 5c682c73716b5d1cd401857e4318adb459aa829c..9b136d55c54a9b1cad16238718548449288af8a3 100644
--- a/data/json/SubAchievementDefinition/875.json
+++ b/data/json/SubAchievementDefinition/875.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 875,
-    "parentDataId": 154,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 154
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - OR- Chapitre X",
diff --git a/data/json/SubAchievementDefinition/876.json b/data/json/SubAchievementDefinition/876.json
index b7bb903c3c0c32a966650b5faed7a8f0136f514e..d95c120f62774f756c3a1714cbe7edd8af7648b1 100644
--- a/data/json/SubAchievementDefinition/876.json
+++ b/data/json/SubAchievementDefinition/876.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 876,
-    "parentDataId": 404,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 404
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 17 Aider Niels Laren à garder sa couverture",
diff --git a/data/json/SubAchievementDefinition/877.json b/data/json/SubAchievementDefinition/877.json
index 59d5ae74713c518584edbf32eda78f2eef3bf07a..a030a9576457eccd3a563c7ae8e05073d1e385c1 100644
--- a/data/json/SubAchievementDefinition/877.json
+++ b/data/json/SubAchievementDefinition/877.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 877,
-    "parentDataId": 747,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 747
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Achever Bworky Pro Graisse avec le Craqueleur Magmatique",
diff --git a/data/json/SubAchievementDefinition/879.json b/data/json/SubAchievementDefinition/879.json
index bea7dc12451546d6886ce2f211dbda2cda583d1e..47bf93d5243324fbfc32fba86539fdf5adab1132 100644
--- a/data/json/SubAchievementDefinition/879.json
+++ b/data/json/SubAchievementDefinition/879.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 879,
-    "parentDataId": 23,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 23
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - IX",
diff --git a/data/json/SubAchievementDefinition/88.json b/data/json/SubAchievementDefinition/88.json
index 634561d305ebe6c1b6e55a175804299afaf4aeeb..ec9bc998113fc6f2291da109f4bc2c3887801f2d 100644
--- a/data/json/SubAchievementDefinition/88.json
+++ b/data/json/SubAchievementDefinition/88.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 88,
-    "parentDataId": 101,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 101
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Dungeon - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/880.json b/data/json/SubAchievementDefinition/880.json
index 00fe88f426b83614e5d5db1d76550f228f3ac576..c36fade779286c00ef12a729b73062b54c448ef3 100644
--- a/data/json/SubAchievementDefinition/880.json
+++ b/data/json/SubAchievementDefinition/880.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 880,
-    "parentDataId": 477,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 477
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Vaincre le Patriarche avant son rituel",
diff --git a/data/json/SubAchievementDefinition/881.json b/data/json/SubAchievementDefinition/881.json
index c5b0d62f10e68a47b6ce5ed57f5046d32c1e2eeb..4bb4bbbbea4390799c2d9cf9700202c3227f1e5c 100644
--- a/data/json/SubAchievementDefinition/881.json
+++ b/data/json/SubAchievementDefinition/881.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 881,
-    "parentDataId": 860,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 860
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/882.json b/data/json/SubAchievementDefinition/882.json
index 7477c9d518fa686938648e9fd7716379b3ab4d41..df03bb770b11642e62a484ca9f13456aaa52e221 100644
--- a/data/json/SubAchievementDefinition/882.json
+++ b/data/json/SubAchievementDefinition/882.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 882,
-    "parentDataId": 901,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 901
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/884.json b/data/json/SubAchievementDefinition/884.json
index 51416964ef1fefc330c42ace51dfc082491cf36f..b822eff48d975fe9dbb69dee9d4a3587f3c4a7bc 100644
--- a/data/json/SubAchievementDefinition/884.json
+++ b/data/json/SubAchievementDefinition/884.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 884,
-    "parentDataId": 169,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 169
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/886.json b/data/json/SubAchievementDefinition/886.json
index 6092ad737ebcde4f4d3d7d839b9f78bd3dd47f03..fd07179a96ba5da474f78b238c6818c729848260 100644
--- a/data/json/SubAchievementDefinition/886.json
+++ b/data/json/SubAchievementDefinition/886.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 886,
-    "parentDataId": 170,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 170
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - Se faire déplacer sur une flaque de lave",
diff --git a/data/json/SubAchievementDefinition/887.json b/data/json/SubAchievementDefinition/887.json
index 4137fe0ca17738f0b0aac02c8484b311d32cb95b..a9ec0b19b325753729edeb916e7ab12311f30db2 100644
--- a/data/json/SubAchievementDefinition/887.json
+++ b/data/json/SubAchievementDefinition/887.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 887,
-    "parentDataId": 919,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 919
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre VII",
diff --git a/data/json/SubAchievementDefinition/888.json b/data/json/SubAchievementDefinition/888.json
index ba99529d2e16d302d76a6d7070a080557e3d5dab..a36161b19407628fb71329cbe4387ce191184c48 100644
--- a/data/json/SubAchievementDefinition/888.json
+++ b/data/json/SubAchievementDefinition/888.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 888,
-    "parentDataId": 622,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 622
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre II",
diff --git a/data/json/SubAchievementDefinition/889.json b/data/json/SubAchievementDefinition/889.json
index 836ef866d0bb0099876acfb334eeda2b5c4b9247..57e6726ba3b6199367f509834882e91b379224f6 100644
--- a/data/json/SubAchievementDefinition/889.json
+++ b/data/json/SubAchievementDefinition/889.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 889,
-    "parentDataId": 877,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 877
+    },
     "completionThreshold": 20
   },
   "m_displayName": "BOUFTOU - DONJON - Terminer 20 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/89.json b/data/json/SubAchievementDefinition/89.json
index 18df8f3529e686bcee14c0645df4e09f64637317..1aa6a3fe95926b455f7c0e187e7f79255786d7bd 100644
--- a/data/json/SubAchievementDefinition/89.json
+++ b/data/json/SubAchievementDefinition/89.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 89,
-    "parentDataId": 177,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 177
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 16 Aider le Craqueleur à se libérer",
diff --git a/data/json/SubAchievementDefinition/892.json b/data/json/SubAchievementDefinition/892.json
index eeb3808be18fede60675d7eda9478fdd5f468684..4592f8e70881ad520cca4567ece4f28fb237f6b0 100644
--- a/data/json/SubAchievementDefinition/892.json
+++ b/data/json/SubAchievementDefinition/892.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 892,
-    "parentDataId": 627,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 627
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Avoir aider Colombe",
diff --git a/data/json/SubAchievementDefinition/893.json b/data/json/SubAchievementDefinition/893.json
index b7e58978594e3480e7f69cac21e2c403064ab9b7..5629ad5e8a8c09b5c8508a2a261696fce1cf1761 100644
--- a/data/json/SubAchievementDefinition/893.json
+++ b/data/json/SubAchievementDefinition/893.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 893,
-    "parentDataId": 11,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 11
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - ARGENT - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/895.json b/data/json/SubAchievementDefinition/895.json
index f2190ce77037dc5955df3d14b1d87033ff286440..f98eb85725cd036417d774d8ba3be3bb731d6fe6 100644
--- a/data/json/SubAchievementDefinition/895.json
+++ b/data/json/SubAchievementDefinition/895.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 895,
-    "parentDataId": 473,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 473
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - OR - Remporter un combat en ayant vu au moins 3 bwork dans une flaque",
diff --git a/data/json/SubAchievementDefinition/896.json b/data/json/SubAchievementDefinition/896.json
index ad1e7e9efddcfb50f1e209c54675ab5020614e24..e11fa89052e0978befe56b127d9f2914b2f3eff5 100644
--- a/data/json/SubAchievementDefinition/896.json
+++ b/data/json/SubAchievementDefinition/896.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 896,
-    "parentDataId": 799,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 799
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Dungeon - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/897.json b/data/json/SubAchievementDefinition/897.json
index aaf9b8ab2cbf36d1e2eeac36cf0aa2b10f6394de..4d04f1239afc72b3075ac9935b3e99ae4eb010c5 100644
--- a/data/json/SubAchievementDefinition/897.json
+++ b/data/json/SubAchievementDefinition/897.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 897,
-    "parentDataId": 398,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 398
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - VII",
diff --git a/data/json/SubAchievementDefinition/898.json b/data/json/SubAchievementDefinition/898.json
index 019e4bc78d85888ee42fbae53ccd164f1215d093..3ba7089a747a4688b387d45c2c39595e02104719 100644
--- a/data/json/SubAchievementDefinition/898.json
+++ b/data/json/SubAchievementDefinition/898.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 898,
-    "parentDataId": 601,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 601
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - BRONZE - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/90.json b/data/json/SubAchievementDefinition/90.json
index ae078eebeb349fe20d301abeece8472223bab35f..c2c00d82de7be6c85a68e5a581570140c05d8e76 100644
--- a/data/json/SubAchievementDefinition/90.json
+++ b/data/json/SubAchievementDefinition/90.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 90,
-    "parentDataId": 580,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 580
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - OR - Détruire 2 tombes maudites en un seul combat",
diff --git a/data/json/SubAchievementDefinition/900.json b/data/json/SubAchievementDefinition/900.json
index 2e0e1e37cc229f121d7ba4586949f8d387ed3e96..789d02d0b0df8a203a8817c08729dea0e6820e42 100644
--- a/data/json/SubAchievementDefinition/900.json
+++ b/data/json/SubAchievementDefinition/900.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 900,
-    "parentDataId": 819,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 819
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - Vaincre une Châtreuse sans qu\u0027elle ne traverse un allié",
diff --git a/data/json/SubAchievementDefinition/901.json b/data/json/SubAchievementDefinition/901.json
index fcdeecb59d7cead46ef3d4afc7ddea1348d52ee7..08e731298a3d23db4ef754ac6e04b88786e90496 100644
--- a/data/json/SubAchievementDefinition/901.json
+++ b/data/json/SubAchievementDefinition/901.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 901,
-    "parentDataId": 232,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 232
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - HUB - Réussir un combat avec votre héros à moins de 10 PV",
diff --git a/data/json/SubAchievementDefinition/902.json b/data/json/SubAchievementDefinition/902.json
index 784505a8fbf604b45ad1ccd71c2eccb05241ffac..78567f79ec8108954a97fa8c86f844cc1bb6965f 100644
--- a/data/json/SubAchievementDefinition/902.json
+++ b/data/json/SubAchievementDefinition/902.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 902,
-    "parentDataId": 782,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 782
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre VI",
diff --git a/data/json/SubAchievementDefinition/903.json b/data/json/SubAchievementDefinition/903.json
index e279b25bfb801e4c46bc30fdd96e3f4134f23de1..798d543053334fa17531770d660d4b3aacf848ef 100644
--- a/data/json/SubAchievementDefinition/903.json
+++ b/data/json/SubAchievementDefinition/903.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 903,
-    "parentDataId": 79,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 79
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - V",
diff --git a/data/json/SubAchievementDefinition/904.json b/data/json/SubAchievementDefinition/904.json
index f39c66a68535ebde9df938597744e544bd9543cd..fee84eb043f883be93b84548fb93802ebdcfd3bf 100644
--- a/data/json/SubAchievementDefinition/904.json
+++ b/data/json/SubAchievementDefinition/904.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 904,
-    "parentDataId": 704,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 704
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Insulter au moins 3 bworks d\u0027un coup avec Raskass",
diff --git a/data/json/SubAchievementDefinition/905.json b/data/json/SubAchievementDefinition/905.json
index 8e9284b92e6d288473de512a9b64b566965be0fc..40435d5516eb8f8dae6b5abc19e0fe80f398f30a 100644
--- a/data/json/SubAchievementDefinition/905.json
+++ b/data/json/SubAchievementDefinition/905.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 905,
-    "parentDataId": 795,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 795
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - DONJON - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/91.json b/data/json/SubAchievementDefinition/91.json
index 74206bece189451bcb221e3b80c2468abad8e0db..4d0e41849510d6c4771dd4922773d5c13d2a9363 100644
--- a/data/json/SubAchievementDefinition/91.json
+++ b/data/json/SubAchievementDefinition/91.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 91,
-    "parentDataId": 126,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 126
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - OR - Chapitre I",
diff --git a/data/json/SubAchievementDefinition/913.json b/data/json/SubAchievementDefinition/913.json
index cb99b043bcc24d518ea2d74ad11b804d2fc1c336..1ad1b2df0485437b2e923de5684a0d81072b8f7c 100644
--- a/data/json/SubAchievementDefinition/913.json
+++ b/data/json/SubAchievementDefinition/913.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 913,
-    "parentDataId": 45,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 45
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q03 - I",
diff --git a/data/json/SubAchievementDefinition/915.json b/data/json/SubAchievementDefinition/915.json
index e06125a9806be105b08dd69ae40c4c6d4107023e..e9e5e00f1d78d24c7ca578dfbead2434803487ab 100644
--- a/data/json/SubAchievementDefinition/915.json
+++ b/data/json/SubAchievementDefinition/915.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 915,
-    "parentDataId": 634,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 634
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - ARGENT - Vaincre le Chevalier de Parme en dernier en Argent ou plus",
diff --git a/data/json/SubAchievementDefinition/916.json b/data/json/SubAchievementDefinition/916.json
index 264398a68b4a92ed4d36474a2b1cfe85d4344b58..4de40b32f89c18c448a83a026c520788bdbf794e 100644
--- a/data/json/SubAchievementDefinition/916.json
+++ b/data/json/SubAchievementDefinition/916.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 916,
-    "parentDataId": 96,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 96
+    },
     "completionThreshold": 30
   },
   "m_displayName": "BWORK - Q01 - Achever 30 Bworks sans subir leur rage",
diff --git a/data/json/SubAchievementDefinition/922.json b/data/json/SubAchievementDefinition/922.json
index 3056d0d3c8d61092eec975a9e9a8376e7b483aef..aea3c96f6b6cb4fcf56ebcd0f38b5c9ad28cc919 100644
--- a/data/json/SubAchievementDefinition/922.json
+++ b/data/json/SubAchievementDefinition/922.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 922,
-    "parentDataId": 402,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 402
+    },
     "completionThreshold": 250
   },
   "m_displayName": "CHAFER - Hub - 250 Chafers",
diff --git a/data/json/SubAchievementDefinition/923.json b/data/json/SubAchievementDefinition/923.json
index efa8c2429447f5b43c540a0713d9b3f06e4a0f30..be4aa93fe15f78c5e7164406cbabb9fd7eb5aa54 100644
--- a/data/json/SubAchievementDefinition/923.json
+++ b/data/json/SubAchievementDefinition/923.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 923,
-    "parentDataId": 534,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 534
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre IV",
diff --git a/data/json/SubAchievementDefinition/926.json b/data/json/SubAchievementDefinition/926.json
index 308e9bc64a6f2bd962a12ef96e696383aa60ec34..a77af017d942a3296cb236eb7d3334c2ac1a3140 100644
--- a/data/json/SubAchievementDefinition/926.json
+++ b/data/json/SubAchievementDefinition/926.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 926,
-    "parentDataId": 416,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 416
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q01 - Remporter un combat sans activer un seul mécanisme ou sol Chafer",
diff --git a/data/json/SubAchievementDefinition/93.json b/data/json/SubAchievementDefinition/93.json
index 9a9643a67e3dd86869aab17df3a3accffa711c5e..a1b454376cc5227f2f4f346a2aac79229823e770 100644
--- a/data/json/SubAchievementDefinition/93.json
+++ b/data/json/SubAchievementDefinition/93.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 93,
-    "parentDataId": 387,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 387
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/934.json b/data/json/SubAchievementDefinition/934.json
index 53b2731c51fb84e33e20756a26e5e74462babe99..318900334cd9983f67dc643f70b30b61aaf6cab7 100644
--- a/data/json/SubAchievementDefinition/934.json
+++ b/data/json/SubAchievementDefinition/934.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 934,
-    "parentDataId": 761,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 761
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q03 - [TODO] 12",
diff --git a/data/json/SubAchievementDefinition/935.json b/data/json/SubAchievementDefinition/935.json
index c6b66517d67ec70bb99314e52b9b4acfc9e07603..8c5edd40620e1830c0fff97f8c0f5f8c4b6a20aa 100644
--- a/data/json/SubAchievementDefinition/935.json
+++ b/data/json/SubAchievementDefinition/935.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 935,
-    "parentDataId": 304,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 304
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 8",
diff --git a/data/json/SubAchievementDefinition/939.json b/data/json/SubAchievementDefinition/939.json
index 083297df0a38ff13ccba3eab6c5c827bb7eed471..29adb5cc7980480bcaf4e6efbdacb42bb0bf59c0 100644
--- a/data/json/SubAchievementDefinition/939.json
+++ b/data/json/SubAchievementDefinition/939.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 939,
-    "parentDataId": 516,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 516
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Hub - Finir son tour avec 4 Tofus envolés ou plus",
diff --git a/data/json/SubAchievementDefinition/941.json b/data/json/SubAchievementDefinition/941.json
index 887f1ea112983de7380d14640860120287ffef61..4ff4e0e1b75ac836d4238b890b7f26d15ad6615f 100644
--- a/data/json/SubAchievementDefinition/941.json
+++ b/data/json/SubAchievementDefinition/941.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 941,
-    "parentDataId": 103,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 103
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/942.json b/data/json/SubAchievementDefinition/942.json
index f12cc7324369c06fc4dec3ee0742b9f7c5e05465..646383dba03537cc707d582aeaa24bcba8835bc0 100644
--- a/data/json/SubAchievementDefinition/942.json
+++ b/data/json/SubAchievementDefinition/942.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 942,
-    "parentDataId": 710,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 710
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q01 - 13 Subir au moins 3 Critiques en un seul tour",
diff --git a/data/json/SubAchievementDefinition/945.json b/data/json/SubAchievementDefinition/945.json
index 6b2fac82a710e33e883b7ec1d4b750877b7cf811..22c97dece792b9d1ae821a2ba0ff155708ab302f 100644
--- a/data/json/SubAchievementDefinition/945.json
+++ b/data/json/SubAchievementDefinition/945.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 945,
-    "parentDataId": 631,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 631
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Q03 - 09 Chapitre IX",
diff --git a/data/json/SubAchievementDefinition/95.json b/data/json/SubAchievementDefinition/95.json
index 13e82b872ca015454e926697eaed259093f7646c..772adc11892358d2410df1a46750350f61f442e6 100644
--- a/data/json/SubAchievementDefinition/95.json
+++ b/data/json/SubAchievementDefinition/95.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 95,
-    "parentDataId": 723,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 723
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q03 - (WIP - Spécifique 2)",
diff --git a/data/json/SubAchievementDefinition/950.json b/data/json/SubAchievementDefinition/950.json
index 4eb5f5a1d848d8649028bac8a2ee95f3bd6b734f..29cbb661f1605a79d4f6f5f97d8f51f2e00e9f5a 100644
--- a/data/json/SubAchievementDefinition/950.json
+++ b/data/json/SubAchievementDefinition/950.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 950,
-    "parentDataId": 632,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 632
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Hub - Achievement 5",
diff --git a/data/json/SubAchievementDefinition/954.json b/data/json/SubAchievementDefinition/954.json
index 08959e71b789af1ef518c733a129f934d9ca8657..d247944d5beca0395e38dc935ec7f43328e4864b 100644
--- a/data/json/SubAchievementDefinition/954.json
+++ b/data/json/SubAchievementDefinition/954.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 954,
-    "parentDataId": 660,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 660
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Q01 - Remporter un combat en déclenchant au moins 5 explosions",
diff --git a/data/json/SubAchievementDefinition/956.json b/data/json/SubAchievementDefinition/956.json
index 16ab93951e2eada2656ba6e470f49ef4d6a95943..f4cfb49e545534a5b21c5f3b00da588a775175bd 100644
--- a/data/json/SubAchievementDefinition/956.json
+++ b/data/json/SubAchievementDefinition/956.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 956,
-    "parentDataId": 502,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 502
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Achievement 2",
diff --git a/data/json/SubAchievementDefinition/958.json b/data/json/SubAchievementDefinition/958.json
index 375285b4e6e148f7d17122102cf2b1f3e21edc74..715ac2eb85e7d2cf061c0246cf53901f83c8342b 100644
--- a/data/json/SubAchievementDefinition/958.json
+++ b/data/json/SubAchievementDefinition/958.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 958,
-    "parentDataId": 667,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 667
+    },
     "completionThreshold": 100
   },
   "m_displayName": "CHAFER - Hub - Remporter 100 combats",
diff --git a/data/json/SubAchievementDefinition/959.json b/data/json/SubAchievementDefinition/959.json
index c8aed5aead7d6dbda41584dbd67e6aa1dedc549f..aa836da0e5807d14b370947384d7e00677889289 100644
--- a/data/json/SubAchievementDefinition/959.json
+++ b/data/json/SubAchievementDefinition/959.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 959,
-    "parentDataId": 788,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 788
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Laisser un BOUFTOU avoir plus de 100 AT",
diff --git a/data/json/SubAchievementDefinition/96.json b/data/json/SubAchievementDefinition/96.json
index 9ae4c0b176007509e31f7fc851e37f839a40807f..902856acce6c298dde18fb2e47fdc98c9bf4f442 100644
--- a/data/json/SubAchievementDefinition/96.json
+++ b/data/json/SubAchievementDefinition/96.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 96,
-    "parentDataId": 943,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 943
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - Chapitre III",
diff --git a/data/json/SubAchievementDefinition/961.json b/data/json/SubAchievementDefinition/961.json
index 270d9e8df5c6aed3f41fa5186f6fd385e112bc65..4b4985f97280dd6a3335bcbf62b9132ffc928d48 100644
--- a/data/json/SubAchievementDefinition/961.json
+++ b/data/json/SubAchievementDefinition/961.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 961,
-    "parentDataId": 105,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 105
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Dungeon - Aider Vorti à piller le Chef du Clan",
diff --git a/data/json/SubAchievementDefinition/962.json b/data/json/SubAchievementDefinition/962.json
index a0b09ec11d277d02fcc6c681a0814bd7516ae5ac..c1a5f42b48ae4eee44f8ce40620c0cc0e5b78c27 100644
--- a/data/json/SubAchievementDefinition/962.json
+++ b/data/json/SubAchievementDefinition/962.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 962,
-    "parentDataId": 406,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 406
+    },
     "completionThreshold": 5
   },
   "m_displayName": "CHAFER - Q01 - Vaincre 5 Arbatarba avant qu\u0027il n\u0027utilise un trait de rancune",
diff --git a/data/json/SubAchievementDefinition/963.json b/data/json/SubAchievementDefinition/963.json
index 7c6acf327400f199031dbece0b3255a96ba7cbc6..0332c87b4ffcb945088bf7720cdcf0f2d2aaf178 100644
--- a/data/json/SubAchievementDefinition/963.json
+++ b/data/json/SubAchievementDefinition/963.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 963,
-    "parentDataId": 714,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 714
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Q03 - VIII",
diff --git a/data/json/SubAchievementDefinition/964.json b/data/json/SubAchievementDefinition/964.json
index 00c923a6da2e011252b3a52b8ee7b4e6b5b80349..d97ef9bb9fd4153b129e10889852ee59f3b4f86f 100644
--- a/data/json/SubAchievementDefinition/964.json
+++ b/data/json/SubAchievementDefinition/964.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 964,
-    "parentDataId": 603,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 603
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/965.json b/data/json/SubAchievementDefinition/965.json
index becf1189b1b3080e522e6b646e1af7a2a3317e68..466d040e74ab6dc8003e0b81402c3a57b019244b 100644
--- a/data/json/SubAchievementDefinition/965.json
+++ b/data/json/SubAchievementDefinition/965.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 965,
-    "parentDataId": 3309,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 3309
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre V",
diff --git a/data/json/SubAchievementDefinition/967.json b/data/json/SubAchievementDefinition/967.json
index be0b1923c45cfb0a8f41c28c25b8a05a51fcc69b..e6a91b67008d59595f1d537307823a392451b623 100644
--- a/data/json/SubAchievementDefinition/967.json
+++ b/data/json/SubAchievementDefinition/967.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 967,
-    "parentDataId": 2460,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 2460
+    },
     "completionThreshold": 10
   },
   "m_displayName": "TOFU - Q01 - Achever 10 Petits Tofus avant qu\u0027il ne s\u0027envole une seule fois",
diff --git a/data/json/SubAchievementDefinition/968.json b/data/json/SubAchievementDefinition/968.json
index 6a7fed48e1872ba11dd0ab8dc862559707fd9701..b8936ee8c9205c0d55d012ed2bff47b53ad48023 100644
--- a/data/json/SubAchievementDefinition/968.json
+++ b/data/json/SubAchievementDefinition/968.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 968,
-    "parentDataId": 687,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 687
+    },
     "completionThreshold": 100
   },
   "m_displayName": "TOFU - Hub - Remporter 100 combats",
diff --git a/data/json/SubAchievementDefinition/969.json b/data/json/SubAchievementDefinition/969.json
index 2f5005d91f2ebabffea6e64798d91d0983d8a706..216fc09da9c89f758ab4cef0cdf5f2cf605304f7 100644
--- a/data/json/SubAchievementDefinition/969.json
+++ b/data/json/SubAchievementDefinition/969.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 969,
-    "parentDataId": 133,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 133
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Dungeon - Avoir vaincu le Pinspoteur",
diff --git a/data/json/SubAchievementDefinition/97.json b/data/json/SubAchievementDefinition/97.json
index acbc91df8da2b826ee5dd1aa82c3487f4c8364dc..7faf423283d7aded14c24100ced65c22c4852fa4 100644
--- a/data/json/SubAchievementDefinition/97.json
+++ b/data/json/SubAchievementDefinition/97.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 97,
-    "parentDataId": 180,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 180
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TOFU - Q01 - Chapitre X",
diff --git a/data/json/SubAchievementDefinition/972.json b/data/json/SubAchievementDefinition/972.json
index d2fa5bc40ad74f96031eccdde3b2c8e16d13f7bb..cf70529ef17aa21fd52039c78c59435402897fa6 100644
--- a/data/json/SubAchievementDefinition/972.json
+++ b/data/json/SubAchievementDefinition/972.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 972,
-    "parentDataId": 249,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 249
+    },
     "completionThreshold": 100
   },
   "m_displayName": "CHAFER - Hub - 100 Chafers",
diff --git a/data/json/SubAchievementDefinition/973.json b/data/json/SubAchievementDefinition/973.json
index 504cbe6c28f25cd5df427494c16265aafaab1ddc..ef0a8345a820e4ca0a05c4b5ee4a2f15d738f132 100644
--- a/data/json/SubAchievementDefinition/973.json
+++ b/data/json/SubAchievementDefinition/973.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 973,
-    "parentDataId": 566,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 566
+    },
     "completionThreshold": 1
   },
   "m_displayName": "TAURE - Q01 - Chapitre VIII",
diff --git a/data/json/SubAchievementDefinition/974.json b/data/json/SubAchievementDefinition/974.json
index 637144138ee2881c6d51019ba27da3e2217ae1c0..38cc64536a57ca6d41ac84bc7a83c87e3bc1f549 100644
--- a/data/json/SubAchievementDefinition/974.json
+++ b/data/json/SubAchievementDefinition/974.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 974,
-    "parentDataId": 268,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 268
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - [TODO] 21",
diff --git a/data/json/SubAchievementDefinition/976.json b/data/json/SubAchievementDefinition/976.json
index e21bd85deca8fbf9d6746f92d48bfa8b0178ce17..2e37076a29f79684dc8aefaadda4b46a8019d58e 100644
--- a/data/json/SubAchievementDefinition/976.json
+++ b/data/json/SubAchievementDefinition/976.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 976,
-    "parentDataId": 358,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 358
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHAFER - Hub - Achever un Crâne avec l\u0027attaque de votre héros",
diff --git a/data/json/SubAchievementDefinition/977.json b/data/json/SubAchievementDefinition/977.json
index ba100836984da7488b9948a08fadd286382952a9..87af3f5ac40fc794b54d8aa3fd513d80aaad3954 100644
--- a/data/json/SubAchievementDefinition/977.json
+++ b/data/json/SubAchievementDefinition/977.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 977,
-    "parentDataId": 964,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 964
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BWORK - Hub - Rester au moins 3 tours dans l\u0027étreinte d\u0027un même Bwork",
diff --git a/data/json/SubAchievementDefinition/984.json b/data/json/SubAchievementDefinition/984.json
index d65f7604f622461ed3d13aa5844ea92ca6fbbf60..feda05aba8ceef862e0f4dcb52ed6e1b89270f34 100644
--- a/data/json/SubAchievementDefinition/984.json
+++ b/data/json/SubAchievementDefinition/984.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 984,
-    "parentDataId": 780,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 780
+    },
     "completionThreshold": 1
   },
   "m_displayName": "COCHON - Dungeon - 23 Vaincre Périgourdin en premier",
diff --git a/data/json/SubAchievementDefinition/986.json b/data/json/SubAchievementDefinition/986.json
index 6d3d0ea969009d748b08e5d489d70a4f1d6c4ee8..e12b0ee0593dda80508eecebb560b164b8648eb9 100644
--- a/data/json/SubAchievementDefinition/986.json
+++ b/data/json/SubAchievementDefinition/986.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 986,
-    "parentDataId": 805,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 805
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Dungeon - 20 Vaincre la Forteresse Royale en dernière",
diff --git a/data/json/SubAchievementDefinition/988.json b/data/json/SubAchievementDefinition/988.json
index e4f034c705629b59ee89d6abbdb1b7b3ea5403ea..f7b2b291a4c98d6a8c826dcd77304280a6b6edab 100644
--- a/data/json/SubAchievementDefinition/988.json
+++ b/data/json/SubAchievementDefinition/988.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 988,
-    "parentDataId": 480,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 480
+    },
     "completionThreshold": 1
   },
   "m_displayName": "CHUCHOTEUR - Q01 - 15 Gagner un combat alors qu\u0027un Monolithe Occulte est présent",
diff --git a/data/json/SubAchievementDefinition/989.json b/data/json/SubAchievementDefinition/989.json
index dca090d8a15fde4e3ed0e2cbb298e769462dc08c..6637aa64de76cf0c8223ecc279b0d84a3705825a 100644
--- a/data/json/SubAchievementDefinition/989.json
+++ b/data/json/SubAchievementDefinition/989.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 989,
-    "parentDataId": 289,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 289
+    },
     "completionThreshold": 20
   },
   "m_displayName": "TAURE - Dungeon - Terminer 20 fois le donjon",
diff --git a/data/json/SubAchievementDefinition/998.json b/data/json/SubAchievementDefinition/998.json
index 5ed8fa4bd274753b6a9c90f96fffb8058e0cbffb..cdc38fa054940013b4eca6e66d41cfc43726a009 100644
--- a/data/json/SubAchievementDefinition/998.json
+++ b/data/json/SubAchievementDefinition/998.json
@@ -4,7 +4,10 @@
   "m_jsonRepresentation": {
     "type": "SubAchievementDefinition",
     "id": 998,
-    "parentDataId": 506,
+    "parentDataId": {
+      "typeEnum": 28,
+      "value": 506
+    },
     "completionThreshold": 1
   },
   "m_displayName": "BOUFTOU - Q01 - Chapitre VI",
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/10.json b/data/json/SubCompanionUnlockableSkillDefinition/10.json
deleted file mode 100644
index e3c304d1d39ed98f8475fd50263c2a7e43fb0e5d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/10.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "10",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 10,
-    "parentDataId": 769,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/102.json b/data/json/SubCompanionUnlockableSkillDefinition/102.json
deleted file mode 100644
index 4e402f062993af7cadcc26aa28e1cbfd1c86335c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/102.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "102",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 102,
-    "parentDataId": 221,
-    "skill": 514,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/1020.json b/data/json/SubCompanionUnlockableSkillDefinition/1020.json
deleted file mode 100644
index 9476afc1fa1b42892e7d33e37b84d95c09832fe7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/1020.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "1020",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 1020,
-    "parentDataId": 847,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/103.json b/data/json/SubCompanionUnlockableSkillDefinition/103.json
deleted file mode 100644
index 5ba7148f3b2e24ff67af61e6d5fd4c20a2936bb6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/103.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "103",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 103,
-    "parentDataId": 124,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/10377.json b/data/json/SubCompanionUnlockableSkillDefinition/10377.json
deleted file mode 100644
index f35da5d196872db32045ec859c341a4f2bf18223..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/10377.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "10377",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 10377,
-    "parentDataId": 807,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/105.json b/data/json/SubCompanionUnlockableSkillDefinition/105.json
deleted file mode 100644
index 2153f97c6f93efdc65c4e3c231e6b3f89af8c830..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/105.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "105",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 105,
-    "parentDataId": 769,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/10655.json b/data/json/SubCompanionUnlockableSkillDefinition/10655.json
deleted file mode 100644
index 480af29447798085016c408c414777dc7956d31e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/10655.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "10655",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 10655,
-    "parentDataId": 807,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/10712.json b/data/json/SubCompanionUnlockableSkillDefinition/10712.json
deleted file mode 100644
index bac5a43753f6b871be9ca1203b032a296f856d1e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/10712.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "10712",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 10712,
-    "parentDataId": 628,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/10968.json b/data/json/SubCompanionUnlockableSkillDefinition/10968.json
deleted file mode 100644
index 64913dd883e4582569e95287b0fbc05cd992546d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/10968.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "10968",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 10968,
-    "parentDataId": 628,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/11.json b/data/json/SubCompanionUnlockableSkillDefinition/11.json
deleted file mode 100644
index 05844fcc13aed00e98f234308a86a90f7e5b71cd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/11.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "11",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 11,
-    "parentDataId": 72,
-    "skill": 642,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/110.json b/data/json/SubCompanionUnlockableSkillDefinition/110.json
deleted file mode 100644
index 131d4250685aefa1617c9a222e1a5524cac77bcc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/110.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "110",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 110,
-    "parentDataId": 339,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/11049.json b/data/json/SubCompanionUnlockableSkillDefinition/11049.json
deleted file mode 100644
index 144b22a0dca41651c173e7391c1c42b63b682dc0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/11049.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "11049",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 11049,
-    "parentDataId": 42,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/11198.json b/data/json/SubCompanionUnlockableSkillDefinition/11198.json
deleted file mode 100644
index 30b3ba683ccf53523e7ea41e3128d0b9eb8581d1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/11198.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "11198",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 11198,
-    "parentDataId": 42,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 300
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/113.json b/data/json/SubCompanionUnlockableSkillDefinition/113.json
deleted file mode 100644
index f4d71d73fe67288db1d2ecaac522ed1d2658bb43..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/113.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "113",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 113,
-    "parentDataId": 946,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/115.json b/data/json/SubCompanionUnlockableSkillDefinition/115.json
deleted file mode 100644
index d87008a56d92fe07c3b1124b7f25ad819cd44e5f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/115.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "115",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 115,
-    "parentDataId": 666,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/1157.json b/data/json/SubCompanionUnlockableSkillDefinition/1157.json
deleted file mode 100644
index 16dc3bceb17687b0ce969ed641be796c536a9a5a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/1157.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "1157",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 1157,
-    "parentDataId": 221,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/11576.json b/data/json/SubCompanionUnlockableSkillDefinition/11576.json
deleted file mode 100644
index 8671825c2620ccf1626139403a514e19c849e0c3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/11576.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "11576",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 11576,
-    "parentDataId": 824,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/116.json b/data/json/SubCompanionUnlockableSkillDefinition/116.json
deleted file mode 100644
index eb29a26c7c37fbf52a0c0958d938f4ff46532a0b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/116.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "116",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 116,
-    "parentDataId": 561,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/117.json b/data/json/SubCompanionUnlockableSkillDefinition/117.json
deleted file mode 100644
index d453d6ca6b4eaccac13d5350308b144ed58168e4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/117.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "117",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 117,
-    "parentDataId": 176,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/118.json b/data/json/SubCompanionUnlockableSkillDefinition/118.json
deleted file mode 100644
index bc8ef15a43eb5a3cfa7a81cf22780daaeab00173..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/118.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "118",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 118,
-    "parentDataId": 124,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/119.json b/data/json/SubCompanionUnlockableSkillDefinition/119.json
deleted file mode 100644
index 31f4b139e92950e0af17e41d55ba0d1c222e3dd1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/119.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "119",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 119,
-    "parentDataId": 72,
-    "skill": 827,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/11972.json b/data/json/SubCompanionUnlockableSkillDefinition/11972.json
deleted file mode 100644
index d4a89b256508e879d07e4a68489b5d5fb3a6feb5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/11972.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "11972",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 11972,
-    "parentDataId": 824,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/12.json b/data/json/SubCompanionUnlockableSkillDefinition/12.json
deleted file mode 100644
index 281c96ce4a9123f1bc3763bb2bfafe5a81801da8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/12.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "12",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 12,
-    "parentDataId": 642,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/121.json b/data/json/SubCompanionUnlockableSkillDefinition/121.json
deleted file mode 100644
index 01620187a27d61b24c752d76c612539a8be404f1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/121.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "121",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 121,
-    "parentDataId": 376,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/12140.json b/data/json/SubCompanionUnlockableSkillDefinition/12140.json
deleted file mode 100644
index 41ee3b48ab1b1c5fc1321f233e39a2a22cf70d45..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/12140.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "12140",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 12140,
-    "parentDataId": 846,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/122.json b/data/json/SubCompanionUnlockableSkillDefinition/122.json
deleted file mode 100644
index 834dd8adb4ce413bdb233d8dd51f24f3af52c0f2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/122.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "122",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 122,
-    "parentDataId": 946,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/123.json b/data/json/SubCompanionUnlockableSkillDefinition/123.json
deleted file mode 100644
index eb242842b4d307c0ee55eda48174c9d3e0b569f0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/123.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "123",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 123,
-    "parentDataId": 824,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/124.json b/data/json/SubCompanionUnlockableSkillDefinition/124.json
deleted file mode 100644
index 9b139e66320f3ef945a590093ec02a9038e00f8b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/124.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "124",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 124,
-    "parentDataId": 176,
-    "skill": 153,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/125.json b/data/json/SubCompanionUnlockableSkillDefinition/125.json
deleted file mode 100644
index 397b9d8d1744fd4f776e281cc0f7a7bbe5ddd4fc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/125.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "125",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 125,
-    "parentDataId": 61,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/12565.json b/data/json/SubCompanionUnlockableSkillDefinition/12565.json
deleted file mode 100644
index 74ce6abce8b536a4392daedd7e48a7accff3e311..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/12565.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "12565",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 12565,
-    "parentDataId": 846,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/126.json b/data/json/SubCompanionUnlockableSkillDefinition/126.json
deleted file mode 100644
index 87bf538477446f3e0fcf200baecb470e71076a1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/126.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "126",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 126,
-    "parentDataId": 666,
-    "skill": 860,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/12739.json b/data/json/SubCompanionUnlockableSkillDefinition/12739.json
deleted file mode 100644
index b1256d4072a26a68fe8f6333e118afeb55abec82..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/12739.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "12739",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 12739,
-    "parentDataId": 846,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/128.json b/data/json/SubCompanionUnlockableSkillDefinition/128.json
deleted file mode 100644
index 3edff1b36379ab10bb36f372e6b51f30690112b8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/128.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "128",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 128,
-    "parentDataId": 32,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/129.json b/data/json/SubCompanionUnlockableSkillDefinition/129.json
deleted file mode 100644
index b11c4186d68a33cdd2133c925f1c64e6a93d74fa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/129.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "129",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 129,
-    "parentDataId": 966,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/12973.json b/data/json/SubCompanionUnlockableSkillDefinition/12973.json
deleted file mode 100644
index 3f7c21b73bbb49f78770b39a9d24015d4554e7cf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/12973.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "12973",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 12973,
-    "parentDataId": 819,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/13.json b/data/json/SubCompanionUnlockableSkillDefinition/13.json
deleted file mode 100644
index 697aab2aa09536f3f2f2d816914ba5ed63e3935b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/13.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "13",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 13,
-    "parentDataId": 824,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/130.json b/data/json/SubCompanionUnlockableSkillDefinition/130.json
deleted file mode 100644
index 7bac7b1cc30d45dcbf24b2e3d30cab070484b4f1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/130.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "130",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 130,
-    "parentDataId": 661,
-    "skill": 278,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/13002.json b/data/json/SubCompanionUnlockableSkillDefinition/13002.json
deleted file mode 100644
index bead8ca616f29daa001c2ecaf5302d8c21e9de47..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/13002.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "13002",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 13002,
-    "parentDataId": 244,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/13079.json b/data/json/SubCompanionUnlockableSkillDefinition/13079.json
deleted file mode 100644
index 8637d053eb8e6b44b2517076d3229618765ccb94..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/13079.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "13079",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 13079,
-    "parentDataId": 244,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/131.json b/data/json/SubCompanionUnlockableSkillDefinition/131.json
deleted file mode 100644
index c779f72697ced6c9f399f5a4835abae2fccdb336..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/131.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "131",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 131,
-    "parentDataId": 946,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/132.json b/data/json/SubCompanionUnlockableSkillDefinition/132.json
deleted file mode 100644
index 6a777f79cb6e65ea4eceae33b59b665912bf7ec5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/132.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "132",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 132,
-    "parentDataId": 633,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/133.json b/data/json/SubCompanionUnlockableSkillDefinition/133.json
deleted file mode 100644
index 834559af5ed09d11db7d09ccf0f8dedb6ea980f3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/133.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "133",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 133,
-    "parentDataId": 483,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/134.json b/data/json/SubCompanionUnlockableSkillDefinition/134.json
deleted file mode 100644
index 0079f73a6ecf622c4b72c55e1120cb322c3af0ec..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/134.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "134",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 134,
-    "parentDataId": 176,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/13431.json b/data/json/SubCompanionUnlockableSkillDefinition/13431.json
deleted file mode 100644
index 819bb2a6b3b1928e645fec8f6785d37279e912fb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/13431.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "13431",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 13431,
-    "parentDataId": 568,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/13440.json b/data/json/SubCompanionUnlockableSkillDefinition/13440.json
deleted file mode 100644
index 79dd47f4294b07ee0db54d23e0ba726d3a2e4473..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/13440.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "13440",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 13440,
-    "parentDataId": 845,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/135.json b/data/json/SubCompanionUnlockableSkillDefinition/135.json
deleted file mode 100644
index 74606127761406fb9a3ecf0b9699cf22d6acd0b7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/135.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "135",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 135,
-    "parentDataId": 801,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/136.json b/data/json/SubCompanionUnlockableSkillDefinition/136.json
deleted file mode 100644
index ffcbf68f7940210662fc076acce7386677de6eaa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/136.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "136",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 136,
-    "parentDataId": 316,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/137.json b/data/json/SubCompanionUnlockableSkillDefinition/137.json
deleted file mode 100644
index 26b2707f69ffda3f1427dfd27f08412e1cf23eab..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/137.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "137",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 137,
-    "parentDataId": 83,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/139.json b/data/json/SubCompanionUnlockableSkillDefinition/139.json
deleted file mode 100644
index 3a40d5520836b8190027e5887b5fe512941eab7e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/139.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "139",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 139,
-    "parentDataId": 664,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/13900.json b/data/json/SubCompanionUnlockableSkillDefinition/13900.json
deleted file mode 100644
index 8b980d1f707a9cfda8a57d93e6c04241cc4d84a8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/13900.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "13900",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 13900,
-    "parentDataId": 188,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/14.json b/data/json/SubCompanionUnlockableSkillDefinition/14.json
deleted file mode 100644
index 317d54e1ac0acf83ae520461828ef4b64d498c04..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/14.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "14",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 14,
-    "parentDataId": 401,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/14093.json b/data/json/SubCompanionUnlockableSkillDefinition/14093.json
deleted file mode 100644
index 4e70967ec909d03d0b0f19a4db0e1d493d679841..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/14093.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "14093",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 14093,
-    "parentDataId": 188,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/141.json b/data/json/SubCompanionUnlockableSkillDefinition/141.json
deleted file mode 100644
index a4fcd10bb3c87a248184017386ee772f34948982..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/141.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "141",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 141,
-    "parentDataId": 339,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/142.json b/data/json/SubCompanionUnlockableSkillDefinition/142.json
deleted file mode 100644
index e959823c4545b72a636cbb204438a64d817f0df1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/142.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "142",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 142,
-    "parentDataId": 633,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/14346.json b/data/json/SubCompanionUnlockableSkillDefinition/14346.json
deleted file mode 100644
index 98e638b259867eea86b7499bb475698e0de2b2db..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/14346.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "14346",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 14346,
-    "parentDataId": 745,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/144.json b/data/json/SubCompanionUnlockableSkillDefinition/144.json
deleted file mode 100644
index 3f61c323f20f25a290a5f0bac120a83cc35e4d54..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/144.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "144",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 144,
-    "parentDataId": 61,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/145.json b/data/json/SubCompanionUnlockableSkillDefinition/145.json
deleted file mode 100644
index 72656d8c06e1dad347f7159b3fc3d38055ed20a3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/145.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "145",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 145,
-    "parentDataId": 61,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/146.json b/data/json/SubCompanionUnlockableSkillDefinition/146.json
deleted file mode 100644
index be720bb2aac3a8f1d7b0b0aaf5f4cc87cc0cf95c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/146.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "146",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 146,
-    "parentDataId": 135,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/147.json b/data/json/SubCompanionUnlockableSkillDefinition/147.json
deleted file mode 100644
index d8e2514013f1e1bfc65f6b20d23a61b878f30275..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/147.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "147",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 147,
-    "parentDataId": 507,
-    "skill": 425,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/14800.json b/data/json/SubCompanionUnlockableSkillDefinition/14800.json
deleted file mode 100644
index a79930f953b70209feaf285b2c5bec0d962f1ff0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/14800.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "14800",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 14800,
-    "parentDataId": 745,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/14834.json b/data/json/SubCompanionUnlockableSkillDefinition/14834.json
deleted file mode 100644
index a6e9876d8cf477cfb9119f1c3cfc8532695f2711..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/14834.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "14834",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 14834,
-    "parentDataId": 966,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/14926.json b/data/json/SubCompanionUnlockableSkillDefinition/14926.json
deleted file mode 100644
index de96a7d129670ee03677c1377a2e7c3130bc708c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/14926.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "14926",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 14926,
-    "parentDataId": 555,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15.json b/data/json/SubCompanionUnlockableSkillDefinition/15.json
deleted file mode 100644
index b078c229cd266573435afb241bedfa662012a59a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15,
-    "parentDataId": 661,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/150.json b/data/json/SubCompanionUnlockableSkillDefinition/150.json
deleted file mode 100644
index 988c8abb7a988c53efc81aa14e4121b8a6d394bb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/150.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "150",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 150,
-    "parentDataId": 83,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15027.json b/data/json/SubCompanionUnlockableSkillDefinition/15027.json
deleted file mode 100644
index d3acec48a4fa1b7e441876d19f371722fed3fc64..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15027.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15027",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15027,
-    "parentDataId": 61,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/151.json b/data/json/SubCompanionUnlockableSkillDefinition/151.json
deleted file mode 100644
index d1e92cc178b61f371235dd36ddcddaa8f364e255..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/151.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "151",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 151,
-    "parentDataId": 32,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/152.json b/data/json/SubCompanionUnlockableSkillDefinition/152.json
deleted file mode 100644
index a5084dfeaba27be9063d56df6f030b558c13f84c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/152.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "152",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 152,
-    "parentDataId": 316,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15256.json b/data/json/SubCompanionUnlockableSkillDefinition/15256.json
deleted file mode 100644
index c55301f1ef1e2a018d4fd305311f2e0d081380f5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15256.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15256",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15256,
-    "parentDataId": 492,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/153.json b/data/json/SubCompanionUnlockableSkillDefinition/153.json
deleted file mode 100644
index 6bc20b3bcf6fed1f413141722e9d4d94df4e37ae..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/153.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "153",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 153,
-    "parentDataId": 778,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/154.json b/data/json/SubCompanionUnlockableSkillDefinition/154.json
deleted file mode 100644
index 874ed5dce624832364df09d937fd72421b87355d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/154.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "154",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 154,
-    "parentDataId": 845,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/155.json b/data/json/SubCompanionUnlockableSkillDefinition/155.json
deleted file mode 100644
index 90038887bd5ab0ff93147131610f47d9c659f5b4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/155.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "155",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 155,
-    "parentDataId": 72,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15584.json b/data/json/SubCompanionUnlockableSkillDefinition/15584.json
deleted file mode 100644
index d4196d17b9d39242aa252f8ea758a3b50bc5d0a5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15584.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15584",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15584,
-    "parentDataId": 897,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/156.json b/data/json/SubCompanionUnlockableSkillDefinition/156.json
deleted file mode 100644
index a77aae74b2d01ca34cbd5c4d75ee83604d1845bc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/156.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "156",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 156,
-    "parentDataId": 401,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/157.json b/data/json/SubCompanionUnlockableSkillDefinition/157.json
deleted file mode 100644
index 80d8072dc16e2029c6da8b5b6077f3a83fdb32b0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/157.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "157",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 157,
-    "parentDataId": 83,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15705.json b/data/json/SubCompanionUnlockableSkillDefinition/15705.json
deleted file mode 100644
index cdd2d3e409894481bd6bc0bc4542d7c3eea48c61..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15705.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15705",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15705,
-    "parentDataId": 244,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15780.json b/data/json/SubCompanionUnlockableSkillDefinition/15780.json
deleted file mode 100644
index 8efc495dc481d181a00d97d34542be5e3db73bcd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15780.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15780",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15780,
-    "parentDataId": 807,
-    "skill": 269,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15792.json b/data/json/SubCompanionUnlockableSkillDefinition/15792.json
deleted file mode 100644
index 6467fcc9894913978d8c68d07735d600e59a36bf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15792.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15792",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15792,
-    "parentDataId": 633,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/158.json b/data/json/SubCompanionUnlockableSkillDefinition/158.json
deleted file mode 100644
index 8fc940f57f06f53f21b506029877fc45749019af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/158.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "158",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 158,
-    "parentDataId": 628,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/15803.json b/data/json/SubCompanionUnlockableSkillDefinition/15803.json
deleted file mode 100644
index e41983133cdd7ddbcdc2e4cfe3f612924a68b81a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/15803.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "15803",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 15803,
-    "parentDataId": 657,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/16.json b/data/json/SubCompanionUnlockableSkillDefinition/16.json
deleted file mode 100644
index 4415d63bd5a26a01935ed8e3ba684151c975b965..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/16.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "16",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 16,
-    "parentDataId": 231,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/160.json b/data/json/SubCompanionUnlockableSkillDefinition/160.json
deleted file mode 100644
index 42aa87fb72befcf5edbc1e58ad93106ffef8d311..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/160.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "160",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 160,
-    "parentDataId": 244,
-    "skill": 735,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/16135.json b/data/json/SubCompanionUnlockableSkillDefinition/16135.json
deleted file mode 100644
index 0b61cb8da8f2ec001df1a6d01f1c7f3bc848629c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/16135.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "16135",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 16135,
-    "parentDataId": 229,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/16161.json b/data/json/SubCompanionUnlockableSkillDefinition/16161.json
deleted file mode 100644
index 039a711a7e6c91b4678211b92e180e0cba96c358..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/16161.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "16161",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 16161,
-    "parentDataId": 389,
-    "skill": 34,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/162.json b/data/json/SubCompanionUnlockableSkillDefinition/162.json
deleted file mode 100644
index f7c1db15311f45dfc77bf1c365dc939acaeac2b1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/162.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "162",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 162,
-    "parentDataId": 657,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/16354.json b/data/json/SubCompanionUnlockableSkillDefinition/16354.json
deleted file mode 100644
index c235eba0e6bf8d37602b9dbb72409022c7ec1270..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/16354.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "16354",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 16354,
-    "parentDataId": 835,
-    "skill": 132,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/164.json b/data/json/SubCompanionUnlockableSkillDefinition/164.json
deleted file mode 100644
index d409e5a1d3424658235418193b5393c8623bbf44..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/164.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "164",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 164,
-    "parentDataId": 72,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/165.json b/data/json/SubCompanionUnlockableSkillDefinition/165.json
deleted file mode 100644
index 03a46b295426d79eca4af19a703683db1e2fba61..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/165.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "165",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 165,
-    "parentDataId": 144,
-    "skill": 856,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/166.json b/data/json/SubCompanionUnlockableSkillDefinition/166.json
deleted file mode 100644
index 1f46b6706ae864a1d03a206b450b6de37fb7da10..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/166.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "166",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 166,
-    "parentDataId": 769,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/16722.json b/data/json/SubCompanionUnlockableSkillDefinition/16722.json
deleted file mode 100644
index f7c84abb165ef134a2e2f0cb952a841b8f7e7051..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/16722.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "16722",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 16722,
-    "parentDataId": 835,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/168.json b/data/json/SubCompanionUnlockableSkillDefinition/168.json
deleted file mode 100644
index 6519cd93e6ccd096b3248df6d641adccb09ed295..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/168.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "168",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 168,
-    "parentDataId": 601,
-    "skill": 691,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/169.json b/data/json/SubCompanionUnlockableSkillDefinition/169.json
deleted file mode 100644
index 7ebbb657b1e4e1e10cb137b0f6e6739209cbaf07..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/169.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "169",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 169,
-    "parentDataId": 832,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/16907.json b/data/json/SubCompanionUnlockableSkillDefinition/16907.json
deleted file mode 100644
index b3e8ad39450723b6b7951e920b8edbdad3a51f7a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/16907.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "16907",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 16907,
-    "parentDataId": 642,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17.json b/data/json/SubCompanionUnlockableSkillDefinition/17.json
deleted file mode 100644
index f3b51d0b8d5239befd42cd614b193d064ac32177..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17,
-    "parentDataId": 689,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17023.json b/data/json/SubCompanionUnlockableSkillDefinition/17023.json
deleted file mode 100644
index f763453d3765445bd25a5e389e76b7cd02fa69aa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17023.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17023",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17023,
-    "parentDataId": 642,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/173.json b/data/json/SubCompanionUnlockableSkillDefinition/173.json
deleted file mode 100644
index 1700278671ea20fb5f1126f55a4f2edc6b769cad..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/173.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "173",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 173,
-    "parentDataId": 933,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17379.json b/data/json/SubCompanionUnlockableSkillDefinition/17379.json
deleted file mode 100644
index be56a4c76086ffb0c66a7383d1cd788357eb8538..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17379.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17379",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17379,
-    "parentDataId": 792,
-    "skill": 99,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17776.json b/data/json/SubCompanionUnlockableSkillDefinition/17776.json
deleted file mode 100644
index 96bb9e87255b77fb2f1cd409fd866b8b9d1b48f0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17776.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17776",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17776,
-    "parentDataId": 359,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17858.json b/data/json/SubCompanionUnlockableSkillDefinition/17858.json
deleted file mode 100644
index b874142b3a7ede8125715d47f27c8d34462d1476..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17858.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17858",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17858,
-    "parentDataId": 359,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17869.json b/data/json/SubCompanionUnlockableSkillDefinition/17869.json
deleted file mode 100644
index f231329b95ef014973efbda1ac58f4c448409145..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17869.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17869",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17869,
-    "parentDataId": 628,
-    "skill": 384,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17872.json b/data/json/SubCompanionUnlockableSkillDefinition/17872.json
deleted file mode 100644
index cff63aa84174985b4426b52ab7cfcf3f44cfa54e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17872.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17872",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17872,
-    "parentDataId": 946,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/179.json b/data/json/SubCompanionUnlockableSkillDefinition/179.json
deleted file mode 100644
index 28c723757d47c67708c6e512d6f38e50eeec5316..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/179.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "179",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 179,
-    "parentDataId": 946,
-    "skill": 838,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/17902.json b/data/json/SubCompanionUnlockableSkillDefinition/17902.json
deleted file mode 100644
index 548d0fb3ab29331a6f0dd732f0e12417bf47b098..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/17902.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "17902",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 17902,
-    "parentDataId": 99,
-    "skill": 318,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18.json b/data/json/SubCompanionUnlockableSkillDefinition/18.json
deleted file mode 100644
index afe1a344080a384e5f1a107225a09abc72077cb7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18,
-    "parentDataId": 561,
-    "skill": 582,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18188.json b/data/json/SubCompanionUnlockableSkillDefinition/18188.json
deleted file mode 100644
index c7bf52d88466930d2e8db04bfe93e897a616fbd3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18188.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18188",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18188,
-    "parentDataId": 99,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/182.json b/data/json/SubCompanionUnlockableSkillDefinition/182.json
deleted file mode 100644
index 1a048670241d6ddf33b9088dda52f33686150bf2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/182.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "182",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 182,
-    "parentDataId": 188,
-    "skill": 298,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18246.json b/data/json/SubCompanionUnlockableSkillDefinition/18246.json
deleted file mode 100644
index ce7bd0db5072b5af581f195ec725a18ae1671065..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18246.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18246",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18246,
-    "parentDataId": 538,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18272.json b/data/json/SubCompanionUnlockableSkillDefinition/18272.json
deleted file mode 100644
index f330404310a9cfede24b3afdfcec7c1399c89d9b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18272.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18272",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18272,
-    "parentDataId": 339,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/184.json b/data/json/SubCompanionUnlockableSkillDefinition/184.json
deleted file mode 100644
index 4af5e450359ada16bc96233eb352be178fd2ddb8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/184.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "184",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 184,
-    "parentDataId": 339,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/185.json b/data/json/SubCompanionUnlockableSkillDefinition/185.json
deleted file mode 100644
index 53055e07d6d201fe3b92d2ee490457a6c5deafc7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/185.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "185",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 185,
-    "parentDataId": 555,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18584.json b/data/json/SubCompanionUnlockableSkillDefinition/18584.json
deleted file mode 100644
index 92dc8042a176be90673dc23bb580ab8d00fa1519..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18584.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18584",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18584,
-    "parentDataId": 769,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/186.json b/data/json/SubCompanionUnlockableSkillDefinition/186.json
deleted file mode 100644
index fc213a287bdf892dde9a6355780eb54d0c5bffcb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/186.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "186",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 186,
-    "parentDataId": 135,
-    "skill": 577,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/187.json b/data/json/SubCompanionUnlockableSkillDefinition/187.json
deleted file mode 100644
index 9d15a724a3e337108051ba59b2c3202e0adc9a52..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/187.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "187",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 187,
-    "parentDataId": 98,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18752.json b/data/json/SubCompanionUnlockableSkillDefinition/18752.json
deleted file mode 100644
index 7e44fec3e109f761176564d212fafdc3dde19b21..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18752.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18752",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18752,
-    "parentDataId": 561,
-    "skill": 580,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/188.json b/data/json/SubCompanionUnlockableSkillDefinition/188.json
deleted file mode 100644
index fb24bd83f6de180c6019080c54a903be4e675542..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/188.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "188",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 188,
-    "parentDataId": 792,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18814.json b/data/json/SubCompanionUnlockableSkillDefinition/18814.json
deleted file mode 100644
index ce3874be4f38685b1b7b920678fdca967fa28833..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18814.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18814",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18814,
-    "parentDataId": 376,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/18890.json b/data/json/SubCompanionUnlockableSkillDefinition/18890.json
deleted file mode 100644
index ef268a0ecd87445406ad46ac75ddd4007a2cc663..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/18890.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "18890",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 18890,
-    "parentDataId": 666,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/189.json b/data/json/SubCompanionUnlockableSkillDefinition/189.json
deleted file mode 100644
index d460a9443c0e92a1522cdebb92d55eb9acbdbf37..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/189.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "189",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 189,
-    "parentDataId": 401,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/19.json b/data/json/SubCompanionUnlockableSkillDefinition/19.json
deleted file mode 100644
index ef7c65d7f2e1147f9515ea4fb7ce5cb1058dec88..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/19.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "19",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 19,
-    "parentDataId": 666,
-    "skill": 193,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/190.json b/data/json/SubCompanionUnlockableSkillDefinition/190.json
deleted file mode 100644
index 5239c82dc616eb225026c8c5f05bd5e6b557e34f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/190.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "190",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 190,
-    "parentDataId": 858,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/19024.json b/data/json/SubCompanionUnlockableSkillDefinition/19024.json
deleted file mode 100644
index e32705c9bcca1ce39f2cdb2d27ab2de84e4378ca..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/19024.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "19024",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 19024,
-    "parentDataId": 98,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/191.json b/data/json/SubCompanionUnlockableSkillDefinition/191.json
deleted file mode 100644
index d00481ef5c5a99dcb6a4679342d1c8f9c7f3d281..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/191.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "191",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 191,
-    "parentDataId": 507,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 300
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/192.json b/data/json/SubCompanionUnlockableSkillDefinition/192.json
deleted file mode 100644
index 5ed30f84e2ca664d80849c1c8964f41ab4045a14..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/192.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "192",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 192,
-    "parentDataId": 561,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/19437.json b/data/json/SubCompanionUnlockableSkillDefinition/19437.json
deleted file mode 100644
index fdf246f2db05375e77ed9a8d6736951d59ddcc17..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/19437.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "19437",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 19437,
-    "parentDataId": 664,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/19441.json b/data/json/SubCompanionUnlockableSkillDefinition/19441.json
deleted file mode 100644
index d02baf72290a344f7e130be5ccc8cd91f7a83d1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/19441.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "19441",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 19441,
-    "parentDataId": 231,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/196.json b/data/json/SubCompanionUnlockableSkillDefinition/196.json
deleted file mode 100644
index 1b5e99d631197fbe3efb28a429460e2f359df240..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/196.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "196",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 196,
-    "parentDataId": 664,
-    "skill": 478,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/1964.json b/data/json/SubCompanionUnlockableSkillDefinition/1964.json
deleted file mode 100644
index 29de76e20e0a3095fdead0295b42ac6d43e0176f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/1964.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "1964",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 1964,
-    "parentDataId": 256,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/19645.json b/data/json/SubCompanionUnlockableSkillDefinition/19645.json
deleted file mode 100644
index 4f1b3205dbe1eac7bc2d2b5a13d752c8b070278f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/19645.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "19645",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 19645,
-    "parentDataId": 389,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/198.json b/data/json/SubCompanionUnlockableSkillDefinition/198.json
deleted file mode 100644
index 64bea242e8bde2d45aaa8d168a62071e6b6a6d95..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/198.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "198",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 198,
-    "parentDataId": 32,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/1997.json b/data/json/SubCompanionUnlockableSkillDefinition/1997.json
deleted file mode 100644
index 630a4f24b24c1652b7a34f9f490d3b5efd8028da..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/1997.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "1997",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 1997,
-    "parentDataId": 229,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/20.json b/data/json/SubCompanionUnlockableSkillDefinition/20.json
deleted file mode 100644
index 0be724d899142ddd0efbe40f6ee71809441f37f9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/20.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "20",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 20,
-    "parentDataId": 847,
-    "skill": 511,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/200.json b/data/json/SubCompanionUnlockableSkillDefinition/200.json
deleted file mode 100644
index b37dc26fd580ec99fdabc3fdc3e2a48257d23b4f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/200.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "200",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 200,
-    "parentDataId": 83,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/201.json b/data/json/SubCompanionUnlockableSkillDefinition/201.json
deleted file mode 100644
index 4941ab96a480bbde6629b847be332410825011ae..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/201.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "201",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 201,
-    "parentDataId": 792,
-    "skill": 806,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/203.json b/data/json/SubCompanionUnlockableSkillDefinition/203.json
deleted file mode 100644
index 7fcb44447153b53e3afd3df0eb7c11f402acfe62..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/203.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "203",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 203,
-    "parentDataId": 401,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/204.json b/data/json/SubCompanionUnlockableSkillDefinition/204.json
deleted file mode 100644
index dd61ab4af40c8f15182beb9d3405d7304d5efe22..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/204.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "204",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 204,
-    "parentDataId": 231,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/205.json b/data/json/SubCompanionUnlockableSkillDefinition/205.json
deleted file mode 100644
index 1ce7a913909b2705792d94d35607f458f87d08f1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/205.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "205",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 205,
-    "parentDataId": 769,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/206.json b/data/json/SubCompanionUnlockableSkillDefinition/206.json
deleted file mode 100644
index ca915c949d499d36abc23c6ee9c572faf3dc56e5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/206.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "206",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 206,
-    "parentDataId": 191,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/207.json b/data/json/SubCompanionUnlockableSkillDefinition/207.json
deleted file mode 100644
index eec2157e0847171afeb27c30954632529c029c08..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/207.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "207",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 207,
-    "parentDataId": 339,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/208.json b/data/json/SubCompanionUnlockableSkillDefinition/208.json
deleted file mode 100644
index 820e13dc942e5b4ecaae249094ed25a2c9137baf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/208.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "208",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 208,
-    "parentDataId": 244,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/209.json b/data/json/SubCompanionUnlockableSkillDefinition/209.json
deleted file mode 100644
index 265f363b3faf214a14c7ce4a06be5c9931620a95..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/209.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "209",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 209,
-    "parentDataId": 561,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/21.json b/data/json/SubCompanionUnlockableSkillDefinition/21.json
deleted file mode 100644
index 17b8eb05a64dd4e64337315c1edb6ed785b078c5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/21.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "21",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 21,
-    "parentDataId": 52,
-    "skill": 329,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/210.json b/data/json/SubCompanionUnlockableSkillDefinition/210.json
deleted file mode 100644
index 38c64ddaa571150e6a193f440fdcbe88f7c28907..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/210.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "210",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 210,
-    "parentDataId": 229,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/211.json b/data/json/SubCompanionUnlockableSkillDefinition/211.json
deleted file mode 100644
index ab3178fe9fbc90ed40e786cd33c729808507c952..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/211.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "211",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 211,
-    "parentDataId": 221,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/213.json b/data/json/SubCompanionUnlockableSkillDefinition/213.json
deleted file mode 100644
index ca12d4f068fcc265c91ccec808f9c596309faa38..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/213.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "213",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 213,
-    "parentDataId": 666,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/215.json b/data/json/SubCompanionUnlockableSkillDefinition/215.json
deleted file mode 100644
index 97701eacf21be688e2c6d35bae80efa1d3794dea..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/215.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "215",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 215,
-    "parentDataId": 231,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 125
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 6
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/216.json b/data/json/SubCompanionUnlockableSkillDefinition/216.json
deleted file mode 100644
index b3535b103ca1ba10934c99f9b636a9c795ac338a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/216.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "216",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 216,
-    "parentDataId": 94,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/217.json b/data/json/SubCompanionUnlockableSkillDefinition/217.json
deleted file mode 100644
index 3e9a9bc313373eaa013beef9cf28d2dd7d937951..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/217.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "217",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 217,
-    "parentDataId": 483,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/218.json b/data/json/SubCompanionUnlockableSkillDefinition/218.json
deleted file mode 100644
index 9fed80c02316529e6586e8c0c840ecac3cff5834..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/218.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "218",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 218,
-    "parentDataId": 847,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/219.json b/data/json/SubCompanionUnlockableSkillDefinition/219.json
deleted file mode 100644
index d4c6ec6c300270b004c38c587eaae25e686c8a49..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/219.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "219",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 219,
-    "parentDataId": 950,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/2210.json b/data/json/SubCompanionUnlockableSkillDefinition/2210.json
deleted file mode 100644
index 963cc770597b4b768a66a2b43cbb61cfb13beb23..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/2210.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "2210",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 2210,
-    "parentDataId": 229,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/222.json b/data/json/SubCompanionUnlockableSkillDefinition/222.json
deleted file mode 100644
index 52876d38cd9a92aec8e33b3e5edc6ad874daee0b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/222.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "222",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 222,
-    "parentDataId": 376,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/223.json b/data/json/SubCompanionUnlockableSkillDefinition/223.json
deleted file mode 100644
index 40979760e617d9064557e668ac332ed1485ce905..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/223.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "223",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 223,
-    "parentDataId": 801,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/224.json b/data/json/SubCompanionUnlockableSkillDefinition/224.json
deleted file mode 100644
index 480f658f696bee754789c9c2301667295f31af84..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/224.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "224",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 224,
-    "parentDataId": 753,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/225.json b/data/json/SubCompanionUnlockableSkillDefinition/225.json
deleted file mode 100644
index dced7fcd39d15c50976853923e3d1e31f14c1fff..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/225.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "225",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 225,
-    "parentDataId": 642,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/226.json b/data/json/SubCompanionUnlockableSkillDefinition/226.json
deleted file mode 100644
index e1dd81d5e5573ef99061a4c84287f52996f02399..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/226.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "226",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 226,
-    "parentDataId": 61,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/227.json b/data/json/SubCompanionUnlockableSkillDefinition/227.json
deleted file mode 100644
index 4f6a1b8b0eccbc298809a30a8cd580ec136a92fa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/227.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "227",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 227,
-    "parentDataId": 845,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/229.json b/data/json/SubCompanionUnlockableSkillDefinition/229.json
deleted file mode 100644
index 3f3fa459d5fd497bdd11a01237aa77c9dcb4e080..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/229.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "229",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 229,
-    "parentDataId": 135,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/23.json b/data/json/SubCompanionUnlockableSkillDefinition/23.json
deleted file mode 100644
index 897a5ee952217d51f1150ed626366573fe30e153..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/23.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "23",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 23,
-    "parentDataId": 162,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/234.json b/data/json/SubCompanionUnlockableSkillDefinition/234.json
deleted file mode 100644
index 4aefc754202f6d3bbe27fb03c7a41074e45015be..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/234.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "234",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 234,
-    "parentDataId": 841,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/24.json b/data/json/SubCompanionUnlockableSkillDefinition/24.json
deleted file mode 100644
index e990d99cde9a84a122e2524b511090df4e4b6dbb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/24.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "24",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 24,
-    "parentDataId": 815,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/240.json b/data/json/SubCompanionUnlockableSkillDefinition/240.json
deleted file mode 100644
index 2d8392de75dfd86194721b0ac8f939a814fb4f96..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/240.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "240",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 240,
-    "parentDataId": 94,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/241.json b/data/json/SubCompanionUnlockableSkillDefinition/241.json
deleted file mode 100644
index aba2d7d94a88928d7f792306ebeb08ed947c5b80..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/241.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "241",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 241,
-    "parentDataId": 376,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/242.json b/data/json/SubCompanionUnlockableSkillDefinition/242.json
deleted file mode 100644
index 3bf3fd98fe983a0aad9bce6f639d42451509873d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/242.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "242",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 242,
-    "parentDataId": 753,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/243.json b/data/json/SubCompanionUnlockableSkillDefinition/243.json
deleted file mode 100644
index c7af45ccd0ee2edce9f58d83b66495224fbc72f0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/243.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "243",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 243,
-    "parentDataId": 858,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/244.json b/data/json/SubCompanionUnlockableSkillDefinition/244.json
deleted file mode 100644
index ad86304f3ab8b3620bff3545c6c5fb75dfeeb8bd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/244.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "244",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 244,
-    "parentDataId": 176,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/245.json b/data/json/SubCompanionUnlockableSkillDefinition/245.json
deleted file mode 100644
index 55987ef4eaab822bb790276eef33980ff5563188..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/245.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "245",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 245,
-    "parentDataId": 633,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/246.json b/data/json/SubCompanionUnlockableSkillDefinition/246.json
deleted file mode 100644
index b36af9302292c4298011e2627df02422c24b9867..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/246.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "246",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 246,
-    "parentDataId": 555,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/247.json b/data/json/SubCompanionUnlockableSkillDefinition/247.json
deleted file mode 100644
index c6da26cb234d4d0e0916e5ff0b2caabad3ad65da..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/247.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "247",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 247,
-    "parentDataId": 188,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/248.json b/data/json/SubCompanionUnlockableSkillDefinition/248.json
deleted file mode 100644
index 4f42819c024e5d9e3847bdc0a9b2b3856eda2868..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/248.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "248",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 248,
-    "parentDataId": 966,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/249.json b/data/json/SubCompanionUnlockableSkillDefinition/249.json
deleted file mode 100644
index 40840e539de013898233ea0089abcd40a2218570..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/249.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "249",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 249,
-    "parentDataId": 256,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/25.json b/data/json/SubCompanionUnlockableSkillDefinition/25.json
deleted file mode 100644
index f7a904de1f0526073c876f52add0f97578208e1c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/25.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "25",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 25,
-    "parentDataId": 745,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/251.json b/data/json/SubCompanionUnlockableSkillDefinition/251.json
deleted file mode 100644
index 0508289e157dd70ba18d2dafb3f1863ea34e98af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/251.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "251",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 251,
-    "parentDataId": 835,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/253.json b/data/json/SubCompanionUnlockableSkillDefinition/253.json
deleted file mode 100644
index 375bc0f4cbccf0a93ecaad5f66ae27893db910bc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/253.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "253",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 253,
-    "parentDataId": 52,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/254.json b/data/json/SubCompanionUnlockableSkillDefinition/254.json
deleted file mode 100644
index bd2b1279f849aac63a281c6c7faf97aedbff88cd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/254.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "254",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 254,
-    "parentDataId": 389,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/259.json b/data/json/SubCompanionUnlockableSkillDefinition/259.json
deleted file mode 100644
index 1f891dd0fab77ef760878ba8949d3d8cbe4b8b5a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/259.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "259",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 259,
-    "parentDataId": 188,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/26.json b/data/json/SubCompanionUnlockableSkillDefinition/26.json
deleted file mode 100644
index 128130235a0bab9afe0730e0a7d76acc4187f4ca..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/26.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "26",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 26,
-    "parentDataId": 832,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/260.json b/data/json/SubCompanionUnlockableSkillDefinition/260.json
deleted file mode 100644
index b01086e1afa01b86f2aa74512f9b84aab4c7a3e8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/260.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "260",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 260,
-    "parentDataId": 807,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/262.json b/data/json/SubCompanionUnlockableSkillDefinition/262.json
deleted file mode 100644
index 4c128d8ab4aa440795368c21052b7646fcf3c49b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/262.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "262",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 262,
-    "parentDataId": 221,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/264.json b/data/json/SubCompanionUnlockableSkillDefinition/264.json
deleted file mode 100644
index da129c3fc1d113d70a39b5210017703487cf43a9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/264.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "264",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 264,
-    "parentDataId": 824,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/265.json b/data/json/SubCompanionUnlockableSkillDefinition/265.json
deleted file mode 100644
index 7195f9015dab0161c27861f0523310375fa25ebb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/265.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "265",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 265,
-    "parentDataId": 841,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/266.json b/data/json/SubCompanionUnlockableSkillDefinition/266.json
deleted file mode 100644
index 63a77bc738df6707f5745132bb40d483936c1afe..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/266.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "266",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 266,
-    "parentDataId": 98,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 300
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/267.json b/data/json/SubCompanionUnlockableSkillDefinition/267.json
deleted file mode 100644
index 25158604cd8f112d2aeb824ba5ceb21b6d91c0fd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/267.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "267",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 267,
-    "parentDataId": 231,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/268.json b/data/json/SubCompanionUnlockableSkillDefinition/268.json
deleted file mode 100644
index a638d141ab71ffe75115fd755571011f73633e2f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/268.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "268",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 268,
-    "parentDataId": 339,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/27.json b/data/json/SubCompanionUnlockableSkillDefinition/27.json
deleted file mode 100644
index e6f52ea284b332dcf6e72c6623baf51867571828..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/27.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "27",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 27,
-    "parentDataId": 176,
-    "skill": 155,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/270.json b/data/json/SubCompanionUnlockableSkillDefinition/270.json
deleted file mode 100644
index ff536e47d8814814aec1c5855313f6466b0f3a99..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/270.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "270",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 270,
-    "parentDataId": 492,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/274.json b/data/json/SubCompanionUnlockableSkillDefinition/274.json
deleted file mode 100644
index 13ab42b9f8d4e14c85409464c5671d472910a76d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/274.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "274",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 274,
-    "parentDataId": 664,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/275.json b/data/json/SubCompanionUnlockableSkillDefinition/275.json
deleted file mode 100644
index 72cfb57e539fa4d426fd63d46b26526eacc87221..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/275.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "275",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 275,
-    "parentDataId": 642,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/276.json b/data/json/SubCompanionUnlockableSkillDefinition/276.json
deleted file mode 100644
index c12c3b70050c651214ef46b8cc8fd5101b237290..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/276.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "276",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 276,
-    "parentDataId": 487,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/277.json b/data/json/SubCompanionUnlockableSkillDefinition/277.json
deleted file mode 100644
index 09e8d5b3b68c3e512fb5482269a5ef7af2c8602e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/277.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "277",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 277,
-    "parentDataId": 819,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 300
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/278.json b/data/json/SubCompanionUnlockableSkillDefinition/278.json
deleted file mode 100644
index 48d5b5f114ecefac012a0b515060b3093cd7ebbd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/278.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "278",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 278,
-    "parentDataId": 841,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/28.json b/data/json/SubCompanionUnlockableSkillDefinition/28.json
deleted file mode 100644
index 4ae3f4f2184dbae4b8ee0642d8addfb15a5d60ef..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/28.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "28",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 28,
-    "parentDataId": 858,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/282.json b/data/json/SubCompanionUnlockableSkillDefinition/282.json
deleted file mode 100644
index 4165e51c1dd4c9d4c6ed9b570dc0ac62a028ecab..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/282.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "282",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 282,
-    "parentDataId": 191,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/284.json b/data/json/SubCompanionUnlockableSkillDefinition/284.json
deleted file mode 100644
index 24ea945cdc8944e6ffa3b5bb911631344227f506..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/284.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "284",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 284,
-    "parentDataId": 801,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/286.json b/data/json/SubCompanionUnlockableSkillDefinition/286.json
deleted file mode 100644
index 134afecec18b2f4ffe22d93782d28bfd38ff9463..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/286.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "286",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 286,
-    "parentDataId": 824,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/289.json b/data/json/SubCompanionUnlockableSkillDefinition/289.json
deleted file mode 100644
index b77978c35d122e435477b0d5065f387a49a4fcb4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/289.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "289",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 289,
-    "parentDataId": 359,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/29.json b/data/json/SubCompanionUnlockableSkillDefinition/29.json
deleted file mode 100644
index 1b987e5b915ff852b8b773b36a41e61d161e7502..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/29.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "29",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 29,
-    "parentDataId": 98,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/291.json b/data/json/SubCompanionUnlockableSkillDefinition/291.json
deleted file mode 100644
index 074c2c42849623572ba29984e435e5179e97dbec..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/291.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "291",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 291,
-    "parentDataId": 389,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/292.json b/data/json/SubCompanionUnlockableSkillDefinition/292.json
deleted file mode 100644
index 6bae769832c2aa717af97375796bcdb64e408911..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/292.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "292",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 292,
-    "parentDataId": 124,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/295.json b/data/json/SubCompanionUnlockableSkillDefinition/295.json
deleted file mode 100644
index c44b23ca478ff76795eab42f23fe1e4b7888c7f7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/295.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "295",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 295,
-    "parentDataId": 657,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/297.json b/data/json/SubCompanionUnlockableSkillDefinition/297.json
deleted file mode 100644
index 7dbaa90f5d6f648175b4dc1702b8da703545262e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/297.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "297",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 297,
-    "parentDataId": 628,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/299.json b/data/json/SubCompanionUnlockableSkillDefinition/299.json
deleted file mode 100644
index 52a0f604839dfc72e60071db5ec04e22903a35f1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/299.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "299",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 299,
-    "parentDataId": 933,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/30.json b/data/json/SubCompanionUnlockableSkillDefinition/30.json
deleted file mode 100644
index 57ec73c16f06f078581145043f7e05b28b8d1192..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/30.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "30",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 30,
-    "parentDataId": 32,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/300.json b/data/json/SubCompanionUnlockableSkillDefinition/300.json
deleted file mode 100644
index d10dcb5574ff0c961255e20381d49a5d80a651d6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/300.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "300",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 300,
-    "parentDataId": 835,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/301.json b/data/json/SubCompanionUnlockableSkillDefinition/301.json
deleted file mode 100644
index 57790a1d5b086d2ba18e71ef95e797adc5665002..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/301.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "301",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 301,
-    "parentDataId": 144,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/3018.json b/data/json/SubCompanionUnlockableSkillDefinition/3018.json
deleted file mode 100644
index 877899ff66b40c796a3865f7d0d70f08c944ab56..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/3018.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "3018",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 3018,
-    "parentDataId": 568,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/304.json b/data/json/SubCompanionUnlockableSkillDefinition/304.json
deleted file mode 100644
index 30f142bc9e7d384a2379e155e065d888c8c800d1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/304.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "304",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 304,
-    "parentDataId": 538,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/305.json b/data/json/SubCompanionUnlockableSkillDefinition/305.json
deleted file mode 100644
index 9f5399a78f3213920b3e7719f1e545cf6161739f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/305.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "305",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 305,
-    "parentDataId": 847,
-    "skill": 190,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/306.json b/data/json/SubCompanionUnlockableSkillDefinition/306.json
deleted file mode 100644
index 382b9702a3ed925726ea9279476c7390cc5ceab7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/306.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "306",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 306,
-    "parentDataId": 135,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/307.json b/data/json/SubCompanionUnlockableSkillDefinition/307.json
deleted file mode 100644
index 929184362b4547761ad58a3a309a8b194bb4bb5f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/307.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "307",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 307,
-    "parentDataId": 745,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/31.json b/data/json/SubCompanionUnlockableSkillDefinition/31.json
deleted file mode 100644
index bf4364efcd8c6c3e79b4841631671edf4865938d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/31.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "31",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 31,
-    "parentDataId": 492,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/310.json b/data/json/SubCompanionUnlockableSkillDefinition/310.json
deleted file mode 100644
index f8a04662d8b52fc7ec139d3fad320650da45327a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/310.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "310",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 310,
-    "parentDataId": 946,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/311.json b/data/json/SubCompanionUnlockableSkillDefinition/311.json
deleted file mode 100644
index 92ad69f3bdad9c41ec496cca3dab0fc2b68a57cd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/311.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "311",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 311,
-    "parentDataId": 846,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/314.json b/data/json/SubCompanionUnlockableSkillDefinition/314.json
deleted file mode 100644
index f9ffc03315a8dd5f1531880beac90a5d59dd1118..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/314.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "314",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 314,
-    "parentDataId": 231,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/315.json b/data/json/SubCompanionUnlockableSkillDefinition/315.json
deleted file mode 100644
index 0846924d4056da294ca789e89cce8bd96227b3fe..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/315.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "315",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 315,
-    "parentDataId": 846,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/317.json b/data/json/SubCompanionUnlockableSkillDefinition/317.json
deleted file mode 100644
index 2075fc42d1a069fcd1517cc34988b4c663d34797..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/317.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "317",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 317,
-    "parentDataId": 858,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/32.json b/data/json/SubCompanionUnlockableSkillDefinition/32.json
deleted file mode 100644
index 2568fed5fdc843dcba36fb6b5d65d5095ff7559c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/32.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "32",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 32,
-    "parentDataId": 483,
-    "skill": 844,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/320.json b/data/json/SubCompanionUnlockableSkillDefinition/320.json
deleted file mode 100644
index 696b4de47022f969ee5766baf121b1beadf0bf6d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/320.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "320",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 320,
-    "parentDataId": 401,
-    "skill": 388,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/321.json b/data/json/SubCompanionUnlockableSkillDefinition/321.json
deleted file mode 100644
index 988d0296be32e609b9b81b7d492f549fae8d465a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/321.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "321",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 321,
-    "parentDataId": 664,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/322.json b/data/json/SubCompanionUnlockableSkillDefinition/322.json
deleted file mode 100644
index 3da5c74ff94cf11d8e8203ec3719b16bbabf1b8c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/322.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "322",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 322,
-    "parentDataId": 933,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/323.json b/data/json/SubCompanionUnlockableSkillDefinition/323.json
deleted file mode 100644
index 880281050ecfe397469a0a233ddce063f494adaa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/323.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "323",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 323,
-    "parentDataId": 215,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/324.json b/data/json/SubCompanionUnlockableSkillDefinition/324.json
deleted file mode 100644
index 0244207c0aea4b2e40002644130802226aecd30d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/324.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "324",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 324,
-    "parentDataId": 191,
-    "skill": 518,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/325.json b/data/json/SubCompanionUnlockableSkillDefinition/325.json
deleted file mode 100644
index 38e598544d9a355ffe6a44ce907cb5da66750b4b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/325.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "325",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 325,
-    "parentDataId": 753,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/326.json b/data/json/SubCompanionUnlockableSkillDefinition/326.json
deleted file mode 100644
index c13bc5649b39613fe0c2651c0fa0dbf53684fa53..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/326.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "326",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 326,
-    "parentDataId": 847,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/327.json b/data/json/SubCompanionUnlockableSkillDefinition/327.json
deleted file mode 100644
index f69eb05d3b74c457aff8a2d31807b584f468cbb1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/327.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "327",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 327,
-    "parentDataId": 815,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/328.json b/data/json/SubCompanionUnlockableSkillDefinition/328.json
deleted file mode 100644
index f3b0163392b584b745a0e9d868bb84dbe76ac759..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/328.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "328",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 328,
-    "parentDataId": 769,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/329.json b/data/json/SubCompanionUnlockableSkillDefinition/329.json
deleted file mode 100644
index 24e80dccc3e6c343bfce925dd394182199cabec9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/329.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "329",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 329,
-    "parentDataId": 745,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/332.json b/data/json/SubCompanionUnlockableSkillDefinition/332.json
deleted file mode 100644
index 8276777ee00e94c6ff3be5325791322f56e56952..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/332.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "332",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 332,
-    "parentDataId": 135,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/333.json b/data/json/SubCompanionUnlockableSkillDefinition/333.json
deleted file mode 100644
index 072ac42a041bf01600e9d38626fdf571816e6d1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/333.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "333",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 333,
-    "parentDataId": 83,
-    "skill": 681,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/335.json b/data/json/SubCompanionUnlockableSkillDefinition/335.json
deleted file mode 100644
index e4e6b65fa2db011138796ac3a430c83f41ec1b4b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/335.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "335",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 335,
-    "parentDataId": 561,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/339.json b/data/json/SubCompanionUnlockableSkillDefinition/339.json
deleted file mode 100644
index b155bd77e15a199ecc3ff76097ac9715c5f4f50d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/339.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "339",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 339,
-    "parentDataId": 276,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/346.json b/data/json/SubCompanionUnlockableSkillDefinition/346.json
deleted file mode 100644
index b78ac340a21f2efef37cc082feb75706b8c34990..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/346.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "346",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 346,
-    "parentDataId": 191,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/35.json b/data/json/SubCompanionUnlockableSkillDefinition/35.json
deleted file mode 100644
index 2b9da2e8d88c727e427a48ab3c0644b1d4f615a3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/35.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "35",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 35,
-    "parentDataId": 65,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/350.json b/data/json/SubCompanionUnlockableSkillDefinition/350.json
deleted file mode 100644
index 09a475334b334658f4d7b6e556549efe59dde676..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/350.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "350",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 350,
-    "parentDataId": 792,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/351.json b/data/json/SubCompanionUnlockableSkillDefinition/351.json
deleted file mode 100644
index 1eb1cbd97282fa596d396e4fd0af514c54957bbf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/351.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "351",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 351,
-    "parentDataId": 244,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/352.json b/data/json/SubCompanionUnlockableSkillDefinition/352.json
deleted file mode 100644
index ad670694c9de888d9ab01e141b85f0b493c12844..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/352.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "352",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 352,
-    "parentDataId": 847,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/353.json b/data/json/SubCompanionUnlockableSkillDefinition/353.json
deleted file mode 100644
index 89e628181039485c3ac54dbc013f52b6b0cce8f8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/353.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "353",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 353,
-    "parentDataId": 401,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/355.json b/data/json/SubCompanionUnlockableSkillDefinition/355.json
deleted file mode 100644
index 735aa07ec1b435644b8be7804f4e540d9edee6a5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/355.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "355",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 355,
-    "parentDataId": 376,
-    "skill": 902,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/356.json b/data/json/SubCompanionUnlockableSkillDefinition/356.json
deleted file mode 100644
index 31e5bea2872183a0b8f68d2c0d033cce7a870316..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/356.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "356",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 356,
-    "parentDataId": 807,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/357.json b/data/json/SubCompanionUnlockableSkillDefinition/357.json
deleted file mode 100644
index f5bfdd4015f79a1c080386337576ddb140f75a5e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/357.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "357",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 357,
-    "parentDataId": 507,
-    "skill": 632,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/358.json b/data/json/SubCompanionUnlockableSkillDefinition/358.json
deleted file mode 100644
index ea7a97020eaf802f692b52721395876425abda19..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/358.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "358",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 358,
-    "parentDataId": 229,
-    "skill": 82,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/359.json b/data/json/SubCompanionUnlockableSkillDefinition/359.json
deleted file mode 100644
index 8e100361d2f0fa8059d14094c0cbf0f8189721fd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/359.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "359",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 359,
-    "parentDataId": 845,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/36.json b/data/json/SubCompanionUnlockableSkillDefinition/36.json
deleted file mode 100644
index b16cc1839b6924a4facf842184c3849594fd80c2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/36.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "36",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 36,
-    "parentDataId": 99,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/360.json b/data/json/SubCompanionUnlockableSkillDefinition/360.json
deleted file mode 100644
index dd5329c06baad3f7cddce6322728936e3b568d38..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/360.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "360",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 360,
-    "parentDataId": 555,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/361.json b/data/json/SubCompanionUnlockableSkillDefinition/361.json
deleted file mode 100644
index ffe1966070dcfc1c164a4973aedb26d8258e4516..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/361.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "361",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 361,
-    "parentDataId": 389,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/363.json b/data/json/SubCompanionUnlockableSkillDefinition/363.json
deleted file mode 100644
index 0c1ac93bc04172dc17852c1ae48b74708d1c06ea..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/363.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "363",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 363,
-    "parentDataId": 359,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/3635.json b/data/json/SubCompanionUnlockableSkillDefinition/3635.json
deleted file mode 100644
index 58c3f4628b669b91b1aee3763cbaaa9444a04137..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/3635.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "3635",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 3635,
-    "parentDataId": 835,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/364.json b/data/json/SubCompanionUnlockableSkillDefinition/364.json
deleted file mode 100644
index f5dc3a01df4732474e767aba27f60593d77b28fd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/364.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "364",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 364,
-    "parentDataId": 689,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/367.json b/data/json/SubCompanionUnlockableSkillDefinition/367.json
deleted file mode 100644
index 1c3fbba5c7c9c2403fd366ef0e649c7fa775a400..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/367.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "367",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 367,
-    "parentDataId": 661,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/368.json b/data/json/SubCompanionUnlockableSkillDefinition/368.json
deleted file mode 100644
index 02754a6f1db9ca95a25496f7c682b70a739d0647..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/368.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "368",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 368,
-    "parentDataId": 32,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/369.json b/data/json/SubCompanionUnlockableSkillDefinition/369.json
deleted file mode 100644
index 952c373f95231742b72d9f5eff3da35d089da39f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/369.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "369",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 369,
-    "parentDataId": 176,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/3690.json b/data/json/SubCompanionUnlockableSkillDefinition/3690.json
deleted file mode 100644
index a1654d69eb1934abb0e4ee36b6999de7aa03ef88..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/3690.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "3690",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 3690,
-    "parentDataId": 492,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/37.json b/data/json/SubCompanionUnlockableSkillDefinition/37.json
deleted file mode 100644
index 9f6e0cc2dc32c8e6c9c2794fc1dcc6bbef913a91..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/37.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "37",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 37,
-    "parentDataId": 845,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/3709.json b/data/json/SubCompanionUnlockableSkillDefinition/3709.json
deleted file mode 100644
index 3227bca485beb1c7f82cb48bc4da00647ada2ee7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/3709.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "3709",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 3709,
-    "parentDataId": 492,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/372.json b/data/json/SubCompanionUnlockableSkillDefinition/372.json
deleted file mode 100644
index 8a8f8af392542a43fb1e3135ef7d9c9bbd2bd433..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/372.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "372",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 372,
-    "parentDataId": 633,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/374.json b/data/json/SubCompanionUnlockableSkillDefinition/374.json
deleted file mode 100644
index b4720404dac4e01f5ac275c15ba102b3227171d7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/374.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "374",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 374,
-    "parentDataId": 221,
-    "skill": 952,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/379.json b/data/json/SubCompanionUnlockableSkillDefinition/379.json
deleted file mode 100644
index 04f876c1c3699ef97be018e4ab73ffcc8fffc798..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/379.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "379",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 379,
-    "parentDataId": 135,
-    "skill": 271,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/38.json b/data/json/SubCompanionUnlockableSkillDefinition/38.json
deleted file mode 100644
index b4f2dbdc66105f990160298b946aac7bbde11cd5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/38.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "38",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 38,
-    "parentDataId": 61,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/380.json b/data/json/SubCompanionUnlockableSkillDefinition/380.json
deleted file mode 100644
index 4f513d7e9f170b9e1eb134595a51e55e8727c0c3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/380.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "380",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 380,
-    "parentDataId": 933,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/381.json b/data/json/SubCompanionUnlockableSkillDefinition/381.json
deleted file mode 100644
index b899496082e5443183b18b423b11cbe53f143c39..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/381.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "381",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 381,
-    "parentDataId": 52,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/382.json b/data/json/SubCompanionUnlockableSkillDefinition/382.json
deleted file mode 100644
index 6ded62bbb575a40818b53222b34276b59143c936..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/382.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "382",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 382,
-    "parentDataId": 858,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/383.json b/data/json/SubCompanionUnlockableSkillDefinition/383.json
deleted file mode 100644
index 1a4396e8c8d9ccb152da6c5bf14391af7442c66b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/383.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "383",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 383,
-    "parentDataId": 72,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/384.json b/data/json/SubCompanionUnlockableSkillDefinition/384.json
deleted file mode 100644
index a9ba65239a29972b7264f666633cf334760b7a1e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/384.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "384",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 384,
-    "parentDataId": 792,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/387.json b/data/json/SubCompanionUnlockableSkillDefinition/387.json
deleted file mode 100644
index 16f7667ecb666af2832d63504a5f6f1f5c69cd15..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/387.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "387",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 387,
-    "parentDataId": 555,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/389.json b/data/json/SubCompanionUnlockableSkillDefinition/389.json
deleted file mode 100644
index f20faad07b1ffcdcda6b1312b8941fbc9e3749f2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/389.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "389",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 389,
-    "parentDataId": 847,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/390.json b/data/json/SubCompanionUnlockableSkillDefinition/390.json
deleted file mode 100644
index 3204b5190451fd01d5e874b5b609bfe33f4e433c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/390.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "390",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 390,
-    "parentDataId": 657,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/391.json b/data/json/SubCompanionUnlockableSkillDefinition/391.json
deleted file mode 100644
index b2fe6d585b3132f25787689ac620bd48b03c7e4e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/391.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "391",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 391,
-    "parentDataId": 99,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/394.json b/data/json/SubCompanionUnlockableSkillDefinition/394.json
deleted file mode 100644
index 44f76b6b073be62dea2db20e0cc2dcdc5c8817bb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/394.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "394",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 394,
-    "parentDataId": 389,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/395.json b/data/json/SubCompanionUnlockableSkillDefinition/395.json
deleted file mode 100644
index b588e469474e3558b31434aa1bcac4af0aa34a6d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/395.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "395",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 395,
-    "parentDataId": 176,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/396.json b/data/json/SubCompanionUnlockableSkillDefinition/396.json
deleted file mode 100644
index 5887b7583cff2857b726826e949eb2006b5e3824..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/396.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "396",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 396,
-    "parentDataId": 507,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/398.json b/data/json/SubCompanionUnlockableSkillDefinition/398.json
deleted file mode 100644
index 0910af3ff60eb347df4574ab47e4bf4faadeb7a3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/398.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "398",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 398,
-    "parentDataId": 753,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/40.json b/data/json/SubCompanionUnlockableSkillDefinition/40.json
deleted file mode 100644
index 603661c169765ff02f317262abd03cdce2729943..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/40.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "40",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 40,
-    "parentDataId": 416,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/400.json b/data/json/SubCompanionUnlockableSkillDefinition/400.json
deleted file mode 100644
index c1c0cb340e0b08859ccc6f95589b86ac00cedb1b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/400.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "400",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 400,
-    "parentDataId": 933,
-    "skill": 359,
-    "costs": []
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/401.json b/data/json/SubCompanionUnlockableSkillDefinition/401.json
deleted file mode 100644
index 26bce715871890fdc2b4242dd70f9ca4b39a5513..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/401.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "401",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 401,
-    "parentDataId": 416,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/402.json b/data/json/SubCompanionUnlockableSkillDefinition/402.json
deleted file mode 100644
index 866a6b363c92957ed0375e62979a68be6ea64ac8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/402.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "402",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 402,
-    "parentDataId": 801,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/403.json b/data/json/SubCompanionUnlockableSkillDefinition/403.json
deleted file mode 100644
index 8912245592a531e850b484fb14f047831e354595..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/403.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "403",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 403,
-    "parentDataId": 94,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/404.json b/data/json/SubCompanionUnlockableSkillDefinition/404.json
deleted file mode 100644
index 8a3f815519fce7a34c575cb5997935a3ce6ab1d3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/404.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "404",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 404,
-    "parentDataId": 61,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/405.json b/data/json/SubCompanionUnlockableSkillDefinition/405.json
deleted file mode 100644
index 8765ba8d593a93c42bf1662247d28e0ba25ecc97..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/405.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "405",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 405,
-    "parentDataId": 642,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/406.json b/data/json/SubCompanionUnlockableSkillDefinition/406.json
deleted file mode 100644
index ecdc431e378bc707785b3e8d35855f3ceb571fd5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/406.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "406",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 406,
-    "parentDataId": 176,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/408.json b/data/json/SubCompanionUnlockableSkillDefinition/408.json
deleted file mode 100644
index ca307de6a499ffe0b9873b0d77dc34b8a7cdb537..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/408.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "408",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 408,
-    "parentDataId": 72,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/409.json b/data/json/SubCompanionUnlockableSkillDefinition/409.json
deleted file mode 100644
index 50ce8672a61dfae875bf2cf3796bc5d54420b7c6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/409.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "409",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 409,
-    "parentDataId": 124,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/41.json b/data/json/SubCompanionUnlockableSkillDefinition/41.json
deleted file mode 100644
index 04776091bf4739fef7aafa6aef69bab5c697e2c5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/41.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "41",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 41,
-    "parentDataId": 389,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/412.json b/data/json/SubCompanionUnlockableSkillDefinition/412.json
deleted file mode 100644
index cb9a003d6a17c14a629c1a55f72594b25b12a999..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/412.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "412",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 412,
-    "parentDataId": 72,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/415.json b/data/json/SubCompanionUnlockableSkillDefinition/415.json
deleted file mode 100644
index ba2840240aef7ad77a3855ac3e62daf2a3f5e467..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/415.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "415",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 415,
-    "parentDataId": 657,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/417.json b/data/json/SubCompanionUnlockableSkillDefinition/417.json
deleted file mode 100644
index 9c99f903b445a0a8f3f2be15fcdb462497aadf2a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/417.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "417",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 417,
-    "parentDataId": 221,
-    "skill": 317,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/418.json b/data/json/SubCompanionUnlockableSkillDefinition/418.json
deleted file mode 100644
index 67b4d8d6b13ae23cdae575ccec743d3a1c596cf7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/418.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "418",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 418,
-    "parentDataId": 561,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/419.json b/data/json/SubCompanionUnlockableSkillDefinition/419.json
deleted file mode 100644
index 94a18d410bb4a7a7873ed247c4ef2160be9f775b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/419.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "419",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 419,
-    "parentDataId": 191,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/420.json b/data/json/SubCompanionUnlockableSkillDefinition/420.json
deleted file mode 100644
index 9c8e494a114062c3190e07028fe35d46ab0849cd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/420.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "420",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 420,
-    "parentDataId": 316,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/421.json b/data/json/SubCompanionUnlockableSkillDefinition/421.json
deleted file mode 100644
index 0e9f0421ca5db8becae1861e2411ca8e1ba0b5dc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/421.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "421",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 421,
-    "parentDataId": 601,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/422.json b/data/json/SubCompanionUnlockableSkillDefinition/422.json
deleted file mode 100644
index 07a255fee8f9d0c6d0a5c17799d025948ffb4caf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/422.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "422",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 422,
-    "parentDataId": 229,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/423.json b/data/json/SubCompanionUnlockableSkillDefinition/423.json
deleted file mode 100644
index 9efbc68ee43b2cda413a789ad3c99f0a250f2704..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/423.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "423",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 423,
-    "parentDataId": 94,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/424.json b/data/json/SubCompanionUnlockableSkillDefinition/424.json
deleted file mode 100644
index 7a7e5c8168d778018318a6f62fc675773b9eb0ad..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/424.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "424",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 424,
-    "parentDataId": 966,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/429.json b/data/json/SubCompanionUnlockableSkillDefinition/429.json
deleted file mode 100644
index 8384e87e99bb7a9ba98990d7bfb21b28cbeeef16..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/429.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "429",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 429,
-    "parentDataId": 42,
-    "skill": 241,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/43.json b/data/json/SubCompanionUnlockableSkillDefinition/43.json
deleted file mode 100644
index edd4e9646cecb125f3a33789479e231f5ac03cd9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/43.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "43",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 43,
-    "parentDataId": 83,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/431.json b/data/json/SubCompanionUnlockableSkillDefinition/431.json
deleted file mode 100644
index 124c1d76752ae92013724fb77516eb1aa89863cf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/431.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "431",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 431,
-    "parentDataId": 492,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/432.json b/data/json/SubCompanionUnlockableSkillDefinition/432.json
deleted file mode 100644
index fe66b020a78947b015e6153e14c5b15450804132..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/432.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "432",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 432,
-    "parentDataId": 835,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/433.json b/data/json/SubCompanionUnlockableSkillDefinition/433.json
deleted file mode 100644
index 3b8b1f808fe9753814a966889cb17c5437ffde28..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/433.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "433",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 433,
-    "parentDataId": 845,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/434.json b/data/json/SubCompanionUnlockableSkillDefinition/434.json
deleted file mode 100644
index 6c269cabbd6a084c8ce593bafbdbaa9ba0603004..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/434.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "434",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 434,
-    "parentDataId": 99,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/4341.json b/data/json/SubCompanionUnlockableSkillDefinition/4341.json
deleted file mode 100644
index 1d30e97249ff841bc66f83042c856726be31c70c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/4341.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4341",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 4341,
-    "parentDataId": 753,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/435.json b/data/json/SubCompanionUnlockableSkillDefinition/435.json
deleted file mode 100644
index 1df1008edc4f5901b3f394b662023e37d2438862..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/435.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "435",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 435,
-    "parentDataId": 256,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/436.json b/data/json/SubCompanionUnlockableSkillDefinition/436.json
deleted file mode 100644
index 7c005aea4673d447ddaa0e15624d44559cf54ea2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/436.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "436",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 436,
-    "parentDataId": 807,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/437.json b/data/json/SubCompanionUnlockableSkillDefinition/437.json
deleted file mode 100644
index f64f27853e6eb82f57e430b09bcf76d87bce3c5a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/437.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "437",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 437,
-    "parentDataId": 83,
-    "skill": 548,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/44.json b/data/json/SubCompanionUnlockableSkillDefinition/44.json
deleted file mode 100644
index 429cd9bc7da316a00f5fa80486c5a6c567fdd815..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/44.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "44",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 44,
-    "parentDataId": 933,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/440.json b/data/json/SubCompanionUnlockableSkillDefinition/440.json
deleted file mode 100644
index d85dcc75f272ca778467820a29e54ae0ea4b0394..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/440.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "440",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 440,
-    "parentDataId": 801,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/441.json b/data/json/SubCompanionUnlockableSkillDefinition/441.json
deleted file mode 100644
index ccc57b45f31e1c8cc6f442cce1a3a9e8dea49717..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/441.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "441",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 441,
-    "parentDataId": 661,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/442.json b/data/json/SubCompanionUnlockableSkillDefinition/442.json
deleted file mode 100644
index 393d838d381b7e48dc006c0cbfeca6cdf481dbed..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/442.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "442",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 442,
-    "parentDataId": 507,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/444.json b/data/json/SubCompanionUnlockableSkillDefinition/444.json
deleted file mode 100644
index cb795f6e434177ee929308f019c29bb839823ea1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/444.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "444",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 444,
-    "parentDataId": 94,
-    "skill": 739,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/445.json b/data/json/SubCompanionUnlockableSkillDefinition/445.json
deleted file mode 100644
index 97f23bb36a31695537dbe21baffa1428fb17a818..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/445.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "445",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 445,
-    "parentDataId": 807,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/447.json b/data/json/SubCompanionUnlockableSkillDefinition/447.json
deleted file mode 100644
index 47cc316dc49ed59cd7e9d3e7fbd5ba534364d147..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/447.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "447",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 447,
-    "parentDataId": 845,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/448.json b/data/json/SubCompanionUnlockableSkillDefinition/448.json
deleted file mode 100644
index 405f13a4506e209d6036ff87911bae733547a28e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/448.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "448",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 448,
-    "parentDataId": 897,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/449.json b/data/json/SubCompanionUnlockableSkillDefinition/449.json
deleted file mode 100644
index 2988c8964e8ad215d3cfeb22c4597ce6efc0d32e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/449.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "449",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 449,
-    "parentDataId": 950,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/45.json b/data/json/SubCompanionUnlockableSkillDefinition/45.json
deleted file mode 100644
index ea533be2944ee130e3a108dd2446f28614652037..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/45.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "45",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 45,
-    "parentDataId": 642,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/450.json b/data/json/SubCompanionUnlockableSkillDefinition/450.json
deleted file mode 100644
index 91bd584cd927de4884e2219077c7e6c3dec65344..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/450.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "450",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 450,
-    "parentDataId": 229,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/451.json b/data/json/SubCompanionUnlockableSkillDefinition/451.json
deleted file mode 100644
index b1b3123ffb953cdc1275f4b6acbcb31a2bc9deea..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/451.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "451",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 451,
-    "parentDataId": 807,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/457.json b/data/json/SubCompanionUnlockableSkillDefinition/457.json
deleted file mode 100644
index 76fd9ed3d0017038648c8492bf293dce1b5e6b72..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/457.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "457",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 457,
-    "parentDataId": 144,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/458.json b/data/json/SubCompanionUnlockableSkillDefinition/458.json
deleted file mode 100644
index 23d6ad566402972a4f0d1ed9d1f107c94e894eaf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/458.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "458",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 458,
-    "parentDataId": 633,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/459.json b/data/json/SubCompanionUnlockableSkillDefinition/459.json
deleted file mode 100644
index e9707dd2bd64934144355332f0585c5d0d665b1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/459.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "459",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 459,
-    "parentDataId": 950,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/46.json b/data/json/SubCompanionUnlockableSkillDefinition/46.json
deleted file mode 100644
index a1b5346a0879f7cfd63f52f4dbd963d1ad0f3899..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/46.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "46",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 46,
-    "parentDataId": 664,
-    "skill": 244,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/460.json b/data/json/SubCompanionUnlockableSkillDefinition/460.json
deleted file mode 100644
index 7927f1a0fd4ca10075b763e13e9d4b8a16a57f7f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/460.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "460",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 460,
-    "parentDataId": 231,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/461.json b/data/json/SubCompanionUnlockableSkillDefinition/461.json
deleted file mode 100644
index 2b546b927d8e0067d743db9fbcbe7ee982e71e40..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/461.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "461",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 461,
-    "parentDataId": 487,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/462.json b/data/json/SubCompanionUnlockableSkillDefinition/462.json
deleted file mode 100644
index 472770ac3c56a67971381fe72cd5a23ca17cc23a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/462.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "462",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 462,
-    "parentDataId": 661,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/463.json b/data/json/SubCompanionUnlockableSkillDefinition/463.json
deleted file mode 100644
index fe144cf76e2ba1d89073c91adf225d927138d32b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/463.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "463",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 463,
-    "parentDataId": 538,
-    "skill": 57,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/466.json b/data/json/SubCompanionUnlockableSkillDefinition/466.json
deleted file mode 100644
index e2cbe06bc8c24bbafd60c7b0b0f7f9380fa4ff0e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/466.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "466",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 466,
-    "parentDataId": 792,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/467.json b/data/json/SubCompanionUnlockableSkillDefinition/467.json
deleted file mode 100644
index db2b2f1ea621b26be675e044a29743d9d77ef411..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/467.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "467",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 467,
-    "parentDataId": 256,
-    "skill": 1762,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/468.json b/data/json/SubCompanionUnlockableSkillDefinition/468.json
deleted file mode 100644
index 1100614c146973e1745e7b69cf3a3bc863187117..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/468.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "468",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 468,
-    "parentDataId": 507,
-    "skill": 527,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/4695.json b/data/json/SubCompanionUnlockableSkillDefinition/4695.json
deleted file mode 100644
index b0a3d9d676dac66a61ce784c14f611296cf3d50a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/4695.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4695",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 4695,
-    "parentDataId": 689,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/470.json b/data/json/SubCompanionUnlockableSkillDefinition/470.json
deleted file mode 100644
index abc7a678774aa23c124d55a5e4af73bd57f4dc0f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/470.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "470",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 470,
-    "parentDataId": 176,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/471.json b/data/json/SubCompanionUnlockableSkillDefinition/471.json
deleted file mode 100644
index 932628022d371bf1ea386c6f2a82b20b3af7095d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/471.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "471",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 471,
-    "parentDataId": 507,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 800
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/472.json b/data/json/SubCompanionUnlockableSkillDefinition/472.json
deleted file mode 100644
index 553513cbaa74931a8f28d7da8fa3124ad66a4609..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/472.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "472",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 472,
-    "parentDataId": 745,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/473.json b/data/json/SubCompanionUnlockableSkillDefinition/473.json
deleted file mode 100644
index 77610acc67841c82ca1c6f3b77b070bd988bb612..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/473.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "473",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 473,
-    "parentDataId": 178,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/474.json b/data/json/SubCompanionUnlockableSkillDefinition/474.json
deleted file mode 100644
index a1c6508e38e2b5fb562fb60aa33b86e71c066af9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/474.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "474",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 474,
-    "parentDataId": 376,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/475.json b/data/json/SubCompanionUnlockableSkillDefinition/475.json
deleted file mode 100644
index 13f53bd4caa28c11338af926692dec2597fe3057..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/475.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "475",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 475,
-    "parentDataId": 94,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/476.json b/data/json/SubCompanionUnlockableSkillDefinition/476.json
deleted file mode 100644
index 5835e19c04f8cb345691a9daf2081615b4829d46..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/476.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "476",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 476,
-    "parentDataId": 568,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 300
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/477.json b/data/json/SubCompanionUnlockableSkillDefinition/477.json
deleted file mode 100644
index 6054455cf274f4b488e64f725db149673e164b64..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/477.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "477",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 477,
-    "parentDataId": 83,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/478.json b/data/json/SubCompanionUnlockableSkillDefinition/478.json
deleted file mode 100644
index 88f8eedebce0d89884ee3d38b6cacc703dbaa37b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/478.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "478",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 478,
-    "parentDataId": 401,
-    "skill": 267,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/479.json b/data/json/SubCompanionUnlockableSkillDefinition/479.json
deleted file mode 100644
index af1e9f9d79477cee5f47c600a6217a4b9f78c15f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/479.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "479",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 479,
-    "parentDataId": 99,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/4796.json b/data/json/SubCompanionUnlockableSkillDefinition/4796.json
deleted file mode 100644
index 46d157324a3ee6d0d08cacd4963f8b999d309ae2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/4796.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4796",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 4796,
-    "parentDataId": 65,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/4799.json b/data/json/SubCompanionUnlockableSkillDefinition/4799.json
deleted file mode 100644
index ead8aba7b2ccee9abe977def96dd4ebff725ffab..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/4799.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4799",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 4799,
-    "parentDataId": 162,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/480.json b/data/json/SubCompanionUnlockableSkillDefinition/480.json
deleted file mode 100644
index 98970adcf85d22c2eb73ee0c9925b1d7f5f11124..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/480.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "480",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 480,
-    "parentDataId": 52,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/484.json b/data/json/SubCompanionUnlockableSkillDefinition/484.json
deleted file mode 100644
index aee0298ace06fbb790f591caa38d9fcfaff7e98b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/484.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "484",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 484,
-    "parentDataId": 847,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/485.json b/data/json/SubCompanionUnlockableSkillDefinition/485.json
deleted file mode 100644
index 685abf9965f04f926df4ac83068aa0c2092d851d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/485.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "485",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 485,
-    "parentDataId": 61,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/486.json b/data/json/SubCompanionUnlockableSkillDefinition/486.json
deleted file mode 100644
index 38ad839692d187192e07d160dc7cbced3da93fc7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/486.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "486",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 486,
-    "parentDataId": 689,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/487.json b/data/json/SubCompanionUnlockableSkillDefinition/487.json
deleted file mode 100644
index b66f6cb52ea861a935269a1774887200fef661ff..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/487.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "487",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 487,
-    "parentDataId": 176,
-    "skill": 229,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/488.json b/data/json/SubCompanionUnlockableSkillDefinition/488.json
deleted file mode 100644
index b80d3aeac26fac9eda6a2884c58d962b634dcac3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/488.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "488",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 488,
-    "parentDataId": 256,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/489.json b/data/json/SubCompanionUnlockableSkillDefinition/489.json
deleted file mode 100644
index 3e6e3a8f04cc1a9df246ca9e9b6adc905c1519ff..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/489.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "489",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 489,
-    "parentDataId": 221,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/490.json b/data/json/SubCompanionUnlockableSkillDefinition/490.json
deleted file mode 100644
index 3a2c267319a0b9ead51f07b01b65e10f91b4d742..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/490.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "490",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 490,
-    "parentDataId": 339,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/491.json b/data/json/SubCompanionUnlockableSkillDefinition/491.json
deleted file mode 100644
index 758aecda2eaadf0562b36717343713ae6ec2cd01..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/491.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "491",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 491,
-    "parentDataId": 778,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/492.json b/data/json/SubCompanionUnlockableSkillDefinition/492.json
deleted file mode 100644
index 3090e5a4ead23e06e73a83222a5459073d8190ad..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/492.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "492",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 492,
-    "parentDataId": 815,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/493.json b/data/json/SubCompanionUnlockableSkillDefinition/493.json
deleted file mode 100644
index 07fc20480bfca7deab4d9774fe5205347b978f57..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/493.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "493",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 493,
-    "parentDataId": 664,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/4941.json b/data/json/SubCompanionUnlockableSkillDefinition/4941.json
deleted file mode 100644
index bc3ec7902165e1110425f85cccc418a8767b4cd7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/4941.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "4941",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 4941,
-    "parentDataId": 832,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/496.json b/data/json/SubCompanionUnlockableSkillDefinition/496.json
deleted file mode 100644
index 06a292e5df9799f7a79282e8bd745c1d3086935b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/496.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "496",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 496,
-    "parentDataId": 65,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/497.json b/data/json/SubCompanionUnlockableSkillDefinition/497.json
deleted file mode 100644
index 38593bade8c0f8d16ac66a846ff75674914ec3ea..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/497.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "497",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 497,
-    "parentDataId": 162,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/499.json b/data/json/SubCompanionUnlockableSkillDefinition/499.json
deleted file mode 100644
index 3873026f962c5f4675207c778ed8636252384a3a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/499.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "499",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 499,
-    "parentDataId": 897,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/5.json b/data/json/SubCompanionUnlockableSkillDefinition/5.json
deleted file mode 100644
index c9b828a857c5575346345e4105bb6bb2f86cda47..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/5.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "5",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 5,
-    "parentDataId": 769,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/501.json b/data/json/SubCompanionUnlockableSkillDefinition/501.json
deleted file mode 100644
index f001d88509bdc7f2f99eaea57e46c0861ba2c47d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/501.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "501",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 501,
-    "parentDataId": 753,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/502.json b/data/json/SubCompanionUnlockableSkillDefinition/502.json
deleted file mode 100644
index ae7a97cc03e49458ad195440d4b0b0dc83d681b2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/502.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "502",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 502,
-    "parentDataId": 135,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/503.json b/data/json/SubCompanionUnlockableSkillDefinition/503.json
deleted file mode 100644
index 9fc2bd0a485e0e61429d8df55c7712330da577f5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/503.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "503",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 503,
-    "parentDataId": 94,
-    "skill": 771,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/504.json b/data/json/SubCompanionUnlockableSkillDefinition/504.json
deleted file mode 100644
index 343f15870d6c976a3df09e785eeda295357b0baf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/504.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "504",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 504,
-    "parentDataId": 215,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/505.json b/data/json/SubCompanionUnlockableSkillDefinition/505.json
deleted file mode 100644
index a47fb8df5854bfe6d403a8d33a000c071a964e06..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/505.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "505",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 505,
-    "parentDataId": 61,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/506.json b/data/json/SubCompanionUnlockableSkillDefinition/506.json
deleted file mode 100644
index 5e1c750d7916e054eda5287f9c8973455896b1a4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/506.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "506",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 506,
-    "parentDataId": 846,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/507.json b/data/json/SubCompanionUnlockableSkillDefinition/507.json
deleted file mode 100644
index 6762ff1c68f76cf4f74b9b67913c0c0466ed4f6d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/507.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "507",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 507,
-    "parentDataId": 342,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/509.json b/data/json/SubCompanionUnlockableSkillDefinition/509.json
deleted file mode 100644
index 8ba458555e60e7db51d0db77dfa64894d07a2f85..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/509.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "509",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 509,
-    "parentDataId": 124,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/510.json b/data/json/SubCompanionUnlockableSkillDefinition/510.json
deleted file mode 100644
index 73285c0d9540d3dfe20f939bfca2e04c37f0a135..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/510.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "510",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 510,
-    "parentDataId": 191,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/512.json b/data/json/SubCompanionUnlockableSkillDefinition/512.json
deleted file mode 100644
index c54bd46188060749378e24203b39e1d3731bfc1e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/512.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "512",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 512,
-    "parentDataId": 846,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/514.json b/data/json/SubCompanionUnlockableSkillDefinition/514.json
deleted file mode 100644
index 37ddf5a80af0be5edb2b8e9945dd24e2dc656e70..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/514.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "514",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 514,
-    "parentDataId": 359,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/516.json b/data/json/SubCompanionUnlockableSkillDefinition/516.json
deleted file mode 100644
index 2468af83fc96805d172f5aaa7a79850480c61cec..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/516.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "516",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 516,
-    "parentDataId": 792,
-    "skill": 564,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/517.json b/data/json/SubCompanionUnlockableSkillDefinition/517.json
deleted file mode 100644
index dcc5de25b99f58288a5a7d3262a3ea42d2b43794..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/517.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "517",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 517,
-    "parentDataId": 32,
-    "skill": 2274,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/518.json b/data/json/SubCompanionUnlockableSkillDefinition/518.json
deleted file mode 100644
index da306ada61fa7dca7c129e9088f839c813543620..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/518.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "518",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 518,
-    "parentDataId": 601,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/519.json b/data/json/SubCompanionUnlockableSkillDefinition/519.json
deleted file mode 100644
index 6f53ed0dfefc888199f99b0933796cd7f84fee12..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/519.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "519",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 519,
-    "parentDataId": 628,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/520.json b/data/json/SubCompanionUnlockableSkillDefinition/520.json
deleted file mode 100644
index 998c848ce6e8de4fe4669191b8affa4e5b243db9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/520.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "520",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 520,
-    "parentDataId": 950,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/521.json b/data/json/SubCompanionUnlockableSkillDefinition/521.json
deleted file mode 100644
index ffb1a0ccba7e7994382883d11f1065520a1d227d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/521.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "521",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 521,
-    "parentDataId": 555,
-    "skill": 350,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/523.json b/data/json/SubCompanionUnlockableSkillDefinition/523.json
deleted file mode 100644
index 65448ddc720cfb62ec4394774d9a14534521a047..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/523.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "523",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 523,
-    "parentDataId": 568,
-    "skill": 626,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/524.json b/data/json/SubCompanionUnlockableSkillDefinition/524.json
deleted file mode 100644
index c05a78d2d74d89ae5bef07268a97f20c77ec0875..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/524.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "524",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 524,
-    "parentDataId": 83,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/525.json b/data/json/SubCompanionUnlockableSkillDefinition/525.json
deleted file mode 100644
index 8fb4b3ab4d41534564d2cda7b45f3bac234b05ed..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/525.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "525",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 525,
-    "parentDataId": 32,
-    "skill": 874,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/526.json b/data/json/SubCompanionUnlockableSkillDefinition/526.json
deleted file mode 100644
index 4063d2078f97d81fe058feab841bd2843ef143ad..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/526.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "526",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 526,
-    "parentDataId": 483,
-    "skill": 92,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/527.json b/data/json/SubCompanionUnlockableSkillDefinition/527.json
deleted file mode 100644
index 68313814a89e5dabafcad3bcc436f820aee3cbb3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/527.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "527",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 527,
-    "parentDataId": 94,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/530.json b/data/json/SubCompanionUnlockableSkillDefinition/530.json
deleted file mode 100644
index 671b1dd8471b53d3064b80dc9ef85eb5882899d3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/530.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "530",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 530,
-    "parentDataId": 933,
-    "skill": 412,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/531.json b/data/json/SubCompanionUnlockableSkillDefinition/531.json
deleted file mode 100644
index 0ba3f4d15deedc96fb32db2c1b77b81a3c300897..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/531.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "531",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 531,
-    "parentDataId": 188,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/533.json b/data/json/SubCompanionUnlockableSkillDefinition/533.json
deleted file mode 100644
index 35d9e1bc8aa73f3d4747bc50d15cc73ce7e5562f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/533.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "533",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 533,
-    "parentDataId": 276,
-    "skill": 621,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/534.json b/data/json/SubCompanionUnlockableSkillDefinition/534.json
deleted file mode 100644
index 3c8fcd0f82fded042209eb133dfa89c025d1ab3b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/534.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "534",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 534,
-    "parentDataId": 52,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/536.json b/data/json/SubCompanionUnlockableSkillDefinition/536.json
deleted file mode 100644
index af16b64e3c869a5078c1d58d1c878e9d9f593156..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/536.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "536",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 536,
-    "parentDataId": 633,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/538.json b/data/json/SubCompanionUnlockableSkillDefinition/538.json
deleted file mode 100644
index b36cd874958068a63f1e942eed181523003ba728..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/538.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "538",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 538,
-    "parentDataId": 32,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/54.json b/data/json/SubCompanionUnlockableSkillDefinition/54.json
deleted file mode 100644
index c2bf7293306fb6f01228f2212dc33aeee9f3a4f8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/54.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "54",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 54,
-    "parentDataId": 950,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/540.json b/data/json/SubCompanionUnlockableSkillDefinition/540.json
deleted file mode 100644
index 0ba009209d7ace5fc769ff972e447fb5929d693f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/540.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "540",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 540,
-    "parentDataId": 276,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/5409.json b/data/json/SubCompanionUnlockableSkillDefinition/5409.json
deleted file mode 100644
index 1d22252b882171ea5874d959df80ede28de791ff..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/5409.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "5409",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 5409,
-    "parentDataId": 950,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/543.json b/data/json/SubCompanionUnlockableSkillDefinition/543.json
deleted file mode 100644
index 315ce507fe8ac92cf236a99a5e10c44cab1596c6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/543.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "543",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 543,
-    "parentDataId": 359,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/5430.json b/data/json/SubCompanionUnlockableSkillDefinition/5430.json
deleted file mode 100644
index 4c1f891dd51fad3db10fddb90d4e0b109c5a4c16..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/5430.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "5430",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 5430,
-    "parentDataId": 950,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/545.json b/data/json/SubCompanionUnlockableSkillDefinition/545.json
deleted file mode 100644
index 9725b4974c2e14879593753776aff1ba8f75626f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/545.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "545",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 545,
-    "parentDataId": 229,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/546.json b/data/json/SubCompanionUnlockableSkillDefinition/546.json
deleted file mode 100644
index a04e2c1b13d60f54630e6ad954fd2c879bee7c74..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/546.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "546",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 546,
-    "parentDataId": 483,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/547.json b/data/json/SubCompanionUnlockableSkillDefinition/547.json
deleted file mode 100644
index a489946ddfd703e1c18d9bfcc38f4e8a325313cc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/547.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "547",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 547,
-    "parentDataId": 256,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/549.json b/data/json/SubCompanionUnlockableSkillDefinition/549.json
deleted file mode 100644
index 9ff825aa5e004e1bb5c0d3ec492aebf15c2ef5b8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/549.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "549",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 549,
-    "parentDataId": 661,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 100
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/550.json b/data/json/SubCompanionUnlockableSkillDefinition/550.json
deleted file mode 100644
index 515be0950d818fcb61d058625f4292898799811b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/550.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "550",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 550,
-    "parentDataId": 32,
-    "skill": 173,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/551.json b/data/json/SubCompanionUnlockableSkillDefinition/551.json
deleted file mode 100644
index 098fc4ed2d90a5d476e958d20987c3ebc4de221f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/551.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "551",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 551,
-    "parentDataId": 824,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/552.json b/data/json/SubCompanionUnlockableSkillDefinition/552.json
deleted file mode 100644
index cce5a77223613b9b5b7f68a8eaeeb2b7fa1a5639..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/552.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "552",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 552,
-    "parentDataId": 845,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/555.json b/data/json/SubCompanionUnlockableSkillDefinition/555.json
deleted file mode 100644
index e664f3eb5ac5340f9b4c39035fc058a3de5d40b4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/555.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "555",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 555,
-    "parentDataId": 835,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/556.json b/data/json/SubCompanionUnlockableSkillDefinition/556.json
deleted file mode 100644
index 236b4208780a1f4b6f8c4c50c7f6d75119a8ac9d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/556.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "556",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 556,
-    "parentDataId": 244,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/557.json b/data/json/SubCompanionUnlockableSkillDefinition/557.json
deleted file mode 100644
index aff582bbd9481e9652d9f37717524c9505cc2f84..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/557.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "557",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 557,
-    "parentDataId": 628,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/5575.json b/data/json/SubCompanionUnlockableSkillDefinition/5575.json
deleted file mode 100644
index f99a54acdefb09bb51d391003d62b57dc8226c14..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/5575.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "5575",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 5575,
-    "parentDataId": 342,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/56.json b/data/json/SubCompanionUnlockableSkillDefinition/56.json
deleted file mode 100644
index 40675365308f28fdd67516db08998f436a5c8984..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/56.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "56",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 56,
-    "parentDataId": 99,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/560.json b/data/json/SubCompanionUnlockableSkillDefinition/560.json
deleted file mode 100644
index 2fcaa31bfc961cc8f4ce3e3d823d4f0b6d4f2206..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/560.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "560",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 560,
-    "parentDataId": 657,
-    "skill": 1812,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/561.json b/data/json/SubCompanionUnlockableSkillDefinition/561.json
deleted file mode 100644
index c4e115796468f1c04d9a73d3e13aa250008a2b4c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/561.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "561",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 561,
-    "parentDataId": 561,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/562.json b/data/json/SubCompanionUnlockableSkillDefinition/562.json
deleted file mode 100644
index 22c58a7e457ec149c75d3f9d6475fd9c0219429e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/562.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "562",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 562,
-    "parentDataId": 52,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/563.json b/data/json/SubCompanionUnlockableSkillDefinition/563.json
deleted file mode 100644
index 41401e25dc85efdc511e931c02359f32939f9316..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/563.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "563",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 563,
-    "parentDataId": 897,
-    "skill": 396,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/565.json b/data/json/SubCompanionUnlockableSkillDefinition/565.json
deleted file mode 100644
index 217c2529fe290f972fd150f316556da55c3f47a8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/565.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "565",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 565,
-    "parentDataId": 745,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 300
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/568.json b/data/json/SubCompanionUnlockableSkillDefinition/568.json
deleted file mode 100644
index 32cc9f9e411418e4403705915e7d37c89d38e9aa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/568.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "568",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 568,
-    "parentDataId": 32,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/57.json b/data/json/SubCompanionUnlockableSkillDefinition/57.json
deleted file mode 100644
index 4c6940f56acb74cc92d8215c992e8392168bdfb4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/57.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "57",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 57,
-    "parentDataId": 561,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/571.json b/data/json/SubCompanionUnlockableSkillDefinition/571.json
deleted file mode 100644
index 752631a6092907942aa5bbc10cb416bce1295c45..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/571.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "571",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 571,
-    "parentDataId": 507,
-    "skill": 824,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/573.json b/data/json/SubCompanionUnlockableSkillDefinition/573.json
deleted file mode 100644
index 151180b69ab886da83201f475fd9c89744d111c5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/573.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "573",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 573,
-    "parentDataId": 83,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/574.json b/data/json/SubCompanionUnlockableSkillDefinition/574.json
deleted file mode 100644
index 108414077a196420772aca0d2ba232d79609038c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/574.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "574",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 574,
-    "parentDataId": 689,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/575.json b/data/json/SubCompanionUnlockableSkillDefinition/575.json
deleted file mode 100644
index ad374021f1b98ace72882f149ca719767fe4da10..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/575.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "575",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 575,
-    "parentDataId": 819,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/576.json b/data/json/SubCompanionUnlockableSkillDefinition/576.json
deleted file mode 100644
index b6a4d9faed277a99734cfeebf531b4858857b03c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/576.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "576",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 576,
-    "parentDataId": 753,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/577.json b/data/json/SubCompanionUnlockableSkillDefinition/577.json
deleted file mode 100644
index 4a007b373fdeec608840ab51e4ceb386b2ae4707..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/577.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "577",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 577,
-    "parentDataId": 231,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/579.json b/data/json/SubCompanionUnlockableSkillDefinition/579.json
deleted file mode 100644
index f44a128c50cd63658f25e1edd5dd5a399a7b775a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/579.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "579",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 579,
-    "parentDataId": 65,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/58.json b/data/json/SubCompanionUnlockableSkillDefinition/58.json
deleted file mode 100644
index adfea86a1a23ccfdebbca255bdec71fb2e3a2719..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/58.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "58",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 58,
-    "parentDataId": 538,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/581.json b/data/json/SubCompanionUnlockableSkillDefinition/581.json
deleted file mode 100644
index 40183b9fd3c90ccdc5c44289df01a06419baf8e0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/581.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "581",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 581,
-    "parentDataId": 229,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/582.json b/data/json/SubCompanionUnlockableSkillDefinition/582.json
deleted file mode 100644
index 1e61c32381a101c0dfc26d71f14630ca077a0f5c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/582.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "582",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 582,
-    "parentDataId": 191,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/583.json b/data/json/SubCompanionUnlockableSkillDefinition/583.json
deleted file mode 100644
index 861958932d9861fc15daa1ee434fb3773901586f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/583.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "583",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 583,
-    "parentDataId": 561,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/584.json b/data/json/SubCompanionUnlockableSkillDefinition/584.json
deleted file mode 100644
index 98f8b469c5157de13f854b29fd8cd3157f8b680f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/584.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "584",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 584,
-    "parentDataId": 897,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/586.json b/data/json/SubCompanionUnlockableSkillDefinition/586.json
deleted file mode 100644
index 5ece0981a25fc76b55142812f74b239b73e15611..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/586.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "586",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 586,
-    "parentDataId": 801,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/587.json b/data/json/SubCompanionUnlockableSkillDefinition/587.json
deleted file mode 100644
index f8ba2fc000888ebcdb20095e3fb49cb44ba65ed4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/587.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "587",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 587,
-    "parentDataId": 276,
-    "skill": 3419,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/588.json b/data/json/SubCompanionUnlockableSkillDefinition/588.json
deleted file mode 100644
index dfc093c825ebdeba14a5ae65a90a981df4e39f1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/588.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "588",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 588,
-    "parentDataId": 642,
-    "skill": 964,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/589.json b/data/json/SubCompanionUnlockableSkillDefinition/589.json
deleted file mode 100644
index 36668bbbcd2aef794d195cd0e4220dcf1018efe5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/589.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "589",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 589,
-    "parentDataId": 897,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/590.json b/data/json/SubCompanionUnlockableSkillDefinition/590.json
deleted file mode 100644
index ec0a5f5ea707c8ca3033a590c99be63ca0535e9c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/590.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "590",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 590,
-    "parentDataId": 276,
-    "skill": 224,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/591.json b/data/json/SubCompanionUnlockableSkillDefinition/591.json
deleted file mode 100644
index 282039593827859596e731d20dcc7c185950f23c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/591.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "591",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 591,
-    "parentDataId": 144,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/594.json b/data/json/SubCompanionUnlockableSkillDefinition/594.json
deleted file mode 100644
index d5fce689897a5ae12c66a64290d23ca959b411af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/594.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "594",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 594,
-    "parentDataId": 32,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/595.json b/data/json/SubCompanionUnlockableSkillDefinition/595.json
deleted file mode 100644
index a414ceeae43a447ff9d4aa2d9067f597bbbdb164..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/595.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "595",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 595,
-    "parentDataId": 642,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/596.json b/data/json/SubCompanionUnlockableSkillDefinition/596.json
deleted file mode 100644
index b7732d174375f004b18ec2df26139bab5864d872..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/596.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "596",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 596,
-    "parentDataId": 492,
-    "skill": 389,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/597.json b/data/json/SubCompanionUnlockableSkillDefinition/597.json
deleted file mode 100644
index 9b9594c03d0a524f964e7b75693c96685adeb82c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/597.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "597",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 597,
-    "parentDataId": 666,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/598.json b/data/json/SubCompanionUnlockableSkillDefinition/598.json
deleted file mode 100644
index b58b871d2d23aac116d8a96bc0ed486e7fd0bce6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/598.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "598",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 598,
-    "parentDataId": 664,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/6.json b/data/json/SubCompanionUnlockableSkillDefinition/6.json
deleted file mode 100644
index d22ade58fe95e79e2ef951823c8e225fc7c6ad14..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/6.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "6",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 6,
-    "parentDataId": 124,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/600.json b/data/json/SubCompanionUnlockableSkillDefinition/600.json
deleted file mode 100644
index bf4d9fd78f99e0822da2681145c3a75bb6d9b380..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/600.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "600",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 600,
-    "parentDataId": 801,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/602.json b/data/json/SubCompanionUnlockableSkillDefinition/602.json
deleted file mode 100644
index d9675d49eee9ab6333201d3394003cd58fb76e07..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/602.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "602",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 602,
-    "parentDataId": 966,
-    "skill": 265,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/603.json b/data/json/SubCompanionUnlockableSkillDefinition/603.json
deleted file mode 100644
index e68bc55ee9d63f4955e405a2a00575e8ae435a49..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/603.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "603",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 603,
-    "parentDataId": 376,
-    "skill": 881,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/605.json b/data/json/SubCompanionUnlockableSkillDefinition/605.json
deleted file mode 100644
index d67a3ca55c4d2071f03ee6b39f73de679bfed69c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/605.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "605",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 605,
-    "parentDataId": 99,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/607.json b/data/json/SubCompanionUnlockableSkillDefinition/607.json
deleted file mode 100644
index 2e6c7cb5da9f87c38c6dd2d2068090b02b81a32d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/607.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "607",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 607,
-    "parentDataId": 244,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/609.json b/data/json/SubCompanionUnlockableSkillDefinition/609.json
deleted file mode 100644
index 4dc3267e57160bd1476cce7adc266d724d49f1c6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/609.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "609",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 609,
-    "parentDataId": 933,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/61.json b/data/json/SubCompanionUnlockableSkillDefinition/61.json
deleted file mode 100644
index 00751cf5397cee6719812407a1b806b3a307d284..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/61.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "61",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 61,
-    "parentDataId": 745,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/611.json b/data/json/SubCompanionUnlockableSkillDefinition/611.json
deleted file mode 100644
index 0b370b6db49e3a7596d28e7251a7d90295433688..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/611.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "611",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 611,
-    "parentDataId": 824,
-    "skill": 799,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/612.json b/data/json/SubCompanionUnlockableSkillDefinition/612.json
deleted file mode 100644
index b6a65a7bfc2af263a1dfcbb5027d4745c1470ace..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/612.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "612",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 612,
-    "parentDataId": 72,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/613.json b/data/json/SubCompanionUnlockableSkillDefinition/613.json
deleted file mode 100644
index 1c3ddbad1c34884395e397ac95f370458419e7d1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/613.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "613",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 613,
-    "parentDataId": 389,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/614.json b/data/json/SubCompanionUnlockableSkillDefinition/614.json
deleted file mode 100644
index 1402e460441002c8663681fa13275c3f031c1088..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/614.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "614",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 614,
-    "parentDataId": 42,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/615.json b/data/json/SubCompanionUnlockableSkillDefinition/615.json
deleted file mode 100644
index 5c0440bcc95127b851ff2571a694af531b755b1c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/615.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "615",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 615,
-    "parentDataId": 229,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/618.json b/data/json/SubCompanionUnlockableSkillDefinition/618.json
deleted file mode 100644
index a879cfdaca76ada09e88bce3d31c22859f90f3d0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/618.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "618",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 618,
-    "parentDataId": 401,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/619.json b/data/json/SubCompanionUnlockableSkillDefinition/619.json
deleted file mode 100644
index 3a386674cbc9afe68d51568b5c8073b6bb04d89b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/619.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "619",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 619,
-    "parentDataId": 376,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/620.json b/data/json/SubCompanionUnlockableSkillDefinition/620.json
deleted file mode 100644
index 162b741d279d9e8113be1c597f4b53af5dba673a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/620.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "620",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 620,
-    "parentDataId": 65,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/621.json b/data/json/SubCompanionUnlockableSkillDefinition/621.json
deleted file mode 100644
index cb6096663142c93e018c8be39b5beac697f496d1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/621.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "621",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 621,
-    "parentDataId": 276,
-    "skill": 923,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/622.json b/data/json/SubCompanionUnlockableSkillDefinition/622.json
deleted file mode 100644
index 2f55426dcfaced5757ba77ea13ed72fcff0b8dc1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/622.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "622",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 622,
-    "parentDataId": 664,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/623.json b/data/json/SubCompanionUnlockableSkillDefinition/623.json
deleted file mode 100644
index df21e430f25d4dc755d814217b3581ada3ffbd57..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/623.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "623",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 623,
-    "parentDataId": 832,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/625.json b/data/json/SubCompanionUnlockableSkillDefinition/625.json
deleted file mode 100644
index f770d484d5163e14bc697859f8b29ae959092684..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/625.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "625",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 625,
-    "parentDataId": 858,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/626.json b/data/json/SubCompanionUnlockableSkillDefinition/626.json
deleted file mode 100644
index 03948782e4617c04afbced7877563274a3261b79..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/626.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "626",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 626,
-    "parentDataId": 824,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/628.json b/data/json/SubCompanionUnlockableSkillDefinition/628.json
deleted file mode 100644
index c8b36441eb93c436ee22b1777a831a7ed408a1fe..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/628.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "628",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 628,
-    "parentDataId": 664,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/629.json b/data/json/SubCompanionUnlockableSkillDefinition/629.json
deleted file mode 100644
index f9f7437967ffaff04104bc4cfc74060d6e17abe5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/629.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "629",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 629,
-    "parentDataId": 555,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/63.json b/data/json/SubCompanionUnlockableSkillDefinition/63.json
deleted file mode 100644
index 1401ee931a9683bc7f5f4cd7d688c5d656673ec4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/63.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "63",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 63,
-    "parentDataId": 94,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/630.json b/data/json/SubCompanionUnlockableSkillDefinition/630.json
deleted file mode 100644
index 2c2359cc861db99e604f5ffdc774a1ada0c0d9fa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/630.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "630",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 630,
-    "parentDataId": 661,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/631.json b/data/json/SubCompanionUnlockableSkillDefinition/631.json
deleted file mode 100644
index 928ddb6b98f75fbf9aacb842dbc1f1a5d2a7caf5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/631.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "631",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 631,
-    "parentDataId": 832,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/632.json b/data/json/SubCompanionUnlockableSkillDefinition/632.json
deleted file mode 100644
index c800ef99406c2c2f1425f6ecb2700e287012d866..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/632.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "632",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 632,
-    "parentDataId": 802,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/634.json b/data/json/SubCompanionUnlockableSkillDefinition/634.json
deleted file mode 100644
index c4bdd85d7271a50c30a4e16b24ecaa1350d1bbe6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/634.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "634",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 634,
-    "parentDataId": 769,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/635.json b/data/json/SubCompanionUnlockableSkillDefinition/635.json
deleted file mode 100644
index 7a7aa512df73fc499ad6e0cb431a5bfd7549af80..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/635.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "635",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 635,
-    "parentDataId": 657,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/637.json b/data/json/SubCompanionUnlockableSkillDefinition/637.json
deleted file mode 100644
index cada5ed5d9b242276751940a515323445a450564..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/637.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "637",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 637,
-    "parentDataId": 661,
-    "skill": 634,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/638.json b/data/json/SubCompanionUnlockableSkillDefinition/638.json
deleted file mode 100644
index 06ea6d5614b153aca24720082784c2dd9b18720e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/638.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "638",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 638,
-    "parentDataId": 841,
-    "skill": 698,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/64.json b/data/json/SubCompanionUnlockableSkillDefinition/64.json
deleted file mode 100644
index ff9020081018671285dddf9f323f1437d854a7c3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/64.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "64",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 64,
-    "parentDataId": 819,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/640.json b/data/json/SubCompanionUnlockableSkillDefinition/640.json
deleted file mode 100644
index efe032b8f6762c3e37b168a3068042fa0281d8cc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/640.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "640",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 640,
-    "parentDataId": 538,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/641.json b/data/json/SubCompanionUnlockableSkillDefinition/641.json
deleted file mode 100644
index 36c4106913f4f151ff18682956e10c4e50571c45..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/641.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "641",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 641,
-    "parentDataId": 359,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/643.json b/data/json/SubCompanionUnlockableSkillDefinition/643.json
deleted file mode 100644
index 53ba7cbeae2ed81e21c5c98968c9ebc4ea8435a7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/643.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "643",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 643,
-    "parentDataId": 492,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/644.json b/data/json/SubCompanionUnlockableSkillDefinition/644.json
deleted file mode 100644
index 2fd6c2b287cff1cefea80d60f7bce9111a365ccb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/644.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "644",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 644,
-    "parentDataId": 483,
-    "skill": 897,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/646.json b/data/json/SubCompanionUnlockableSkillDefinition/646.json
deleted file mode 100644
index e5179feee9a15ad76b6614d6cbfd0e6dec3a5244..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/646.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "646",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 646,
-    "parentDataId": 815,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/647.json b/data/json/SubCompanionUnlockableSkillDefinition/647.json
deleted file mode 100644
index bd9218b4468dad8d6083f8551141ef4200565dd0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/647.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "647",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 647,
-    "parentDataId": 815,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/648.json b/data/json/SubCompanionUnlockableSkillDefinition/648.json
deleted file mode 100644
index e570199a5c64ffea96c865d4b527b8304da22f60..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/648.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "648",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 648,
-    "parentDataId": 256,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/65.json b/data/json/SubCompanionUnlockableSkillDefinition/65.json
deleted file mode 100644
index 6be0702f6630c499521e1d3b1739c4315516265a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/65.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "65",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 65,
-    "parentDataId": 555,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/650.json b/data/json/SubCompanionUnlockableSkillDefinition/650.json
deleted file mode 100644
index 219d4578d28bd670f42deda0314606421ceb2faa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/650.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "650",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 650,
-    "parentDataId": 832,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/651.json b/data/json/SubCompanionUnlockableSkillDefinition/651.json
deleted file mode 100644
index f6b1897275df7aeffba811e441a195e878dc7882..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/651.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "651",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 651,
-    "parentDataId": 416,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/654.json b/data/json/SubCompanionUnlockableSkillDefinition/654.json
deleted file mode 100644
index b382d27a978e8a85575d7949e9657698fd2eac59..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/654.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "654",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 654,
-    "parentDataId": 835,
-    "skill": 892,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/655.json b/data/json/SubCompanionUnlockableSkillDefinition/655.json
deleted file mode 100644
index fff0879f62391de55c994655257a9ee99298109e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/655.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "655",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 655,
-    "parentDataId": 657,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/656.json b/data/json/SubCompanionUnlockableSkillDefinition/656.json
deleted file mode 100644
index e6a371b65dacd725830b001f1dbc8f9aaea3659c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/656.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "656",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 656,
-    "parentDataId": 845,
-    "skill": 49,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/657.json b/data/json/SubCompanionUnlockableSkillDefinition/657.json
deleted file mode 100644
index 1603f25aba129aecd7bdf62afed72a819a161634..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/657.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "657",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 657,
-    "parentDataId": 832,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/66.json b/data/json/SubCompanionUnlockableSkillDefinition/66.json
deleted file mode 100644
index 4288b966b375dc761bddc610d6c3b85750f1954d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/66.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "66",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 66,
-    "parentDataId": 642,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/660.json b/data/json/SubCompanionUnlockableSkillDefinition/660.json
deleted file mode 100644
index 0436209961cd8349700dace58fa97234df9827e6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/660.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "660",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 660,
-    "parentDataId": 276,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/661.json b/data/json/SubCompanionUnlockableSkillDefinition/661.json
deleted file mode 100644
index 0e61e261669369e990f9229463ca958789107f8f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/661.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "661",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 661,
-    "parentDataId": 661,
-    "skill": 581,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/662.json b/data/json/SubCompanionUnlockableSkillDefinition/662.json
deleted file mode 100644
index f1f0c6ca1bb338abe79d7cbd72cb6740bc6acd01..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/662.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "662",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 662,
-    "parentDataId": 561,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/663.json b/data/json/SubCompanionUnlockableSkillDefinition/663.json
deleted file mode 100644
index aaea639abcc911f09e3d8b3a9fc09c34b87f5a43..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/663.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "663",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 663,
-    "parentDataId": 176,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/6652.json b/data/json/SubCompanionUnlockableSkillDefinition/6652.json
deleted file mode 100644
index c8c39ae1ebc3e957cf96e26537362dd7c228c382..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/6652.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "6652",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 6652,
-    "parentDataId": 792,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/666.json b/data/json/SubCompanionUnlockableSkillDefinition/666.json
deleted file mode 100644
index 6cde8a744e2765537157dc676896ca23679aa60a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/666.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "666",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 666,
-    "parentDataId": 221,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/668.json b/data/json/SubCompanionUnlockableSkillDefinition/668.json
deleted file mode 100644
index 41354350879fbcf42d3431671d80585c2a5d9e40..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/668.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "668",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 668,
-    "parentDataId": 492,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/669.json b/data/json/SubCompanionUnlockableSkillDefinition/669.json
deleted file mode 100644
index 69a513fc7b1b4252fd9f3ba3f91be66c3b9ca495..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/669.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "669",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 669,
-    "parentDataId": 276,
-    "skill": 883,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/67.json b/data/json/SubCompanionUnlockableSkillDefinition/67.json
deleted file mode 100644
index 75bbcac7c1bf3959f2ff414823f71d08077ca6e3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/67.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "67",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 67,
-    "parentDataId": 32,
-    "skill": 94,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/670.json b/data/json/SubCompanionUnlockableSkillDefinition/670.json
deleted file mode 100644
index 479064685386b82bdcc1620c9f63d672b1106e82..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/670.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "670",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 670,
-    "parentDataId": 256,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/671.json b/data/json/SubCompanionUnlockableSkillDefinition/671.json
deleted file mode 100644
index 748acc34089c11d3ba5af472604babc4e19c59fa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/671.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "671",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 671,
-    "parentDataId": 966,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/672.json b/data/json/SubCompanionUnlockableSkillDefinition/672.json
deleted file mode 100644
index 23ae74848ea96c9f8e50377edf0db9e9e6fcdd80..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/672.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "672",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 672,
-    "parentDataId": 401,
-    "skill": 527,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/674.json b/data/json/SubCompanionUnlockableSkillDefinition/674.json
deleted file mode 100644
index f687275c9093f15956423bec448d0862e75be75c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/674.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "674",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 674,
-    "parentDataId": 897,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/676.json b/data/json/SubCompanionUnlockableSkillDefinition/676.json
deleted file mode 100644
index 0f107eff34af654f658f728ff66e90d12d1c3ae6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/676.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "676",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 676,
-    "parentDataId": 824,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/678.json b/data/json/SubCompanionUnlockableSkillDefinition/678.json
deleted file mode 100644
index ef933e952af4652140125253e9fb9f81159c7a3d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/678.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "678",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 678,
-    "parentDataId": 221,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/679.json b/data/json/SubCompanionUnlockableSkillDefinition/679.json
deleted file mode 100644
index 6b012a639a216312ed6f8cc27ea46e17392a7525..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/679.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "679",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 679,
-    "parentDataId": 359,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/68.json b/data/json/SubCompanionUnlockableSkillDefinition/68.json
deleted file mode 100644
index 6e6f45f3accb6b5870a34385448d822c1e5f9aee..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/68.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "68",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 68,
-    "parentDataId": 819,
-    "skill": 314,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/6819.json b/data/json/SubCompanionUnlockableSkillDefinition/6819.json
deleted file mode 100644
index 8f667dd5a0d1a9c70f897702144bcb917b57ff15..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/6819.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "6819",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 6819,
-    "parentDataId": 897,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/682.json b/data/json/SubCompanionUnlockableSkillDefinition/682.json
deleted file mode 100644
index 111e9349ca2641fc687301c59c4778b252af70c8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/682.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "682",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 682,
-    "parentDataId": 52,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/683.json b/data/json/SubCompanionUnlockableSkillDefinition/683.json
deleted file mode 100644
index 51be7a161643ee3c7a74a6ff21498281e24be036..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/683.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "683",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 683,
-    "parentDataId": 801,
-    "skill": 916,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/684.json b/data/json/SubCompanionUnlockableSkillDefinition/684.json
deleted file mode 100644
index 3dbbd661fdf09670b1a95bca30fbf8c002cc1599..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/684.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "684",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 684,
-    "parentDataId": 661,
-    "skill": 527,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/686.json b/data/json/SubCompanionUnlockableSkillDefinition/686.json
deleted file mode 100644
index af347eb5ffcebdc29726281b4979c51f09e54898..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/686.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "686",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 686,
-    "parentDataId": 568,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/687.json b/data/json/SubCompanionUnlockableSkillDefinition/687.json
deleted file mode 100644
index 2df4474dc411685adacde99b7d81d121588c49d7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/687.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "687",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 687,
-    "parentDataId": 841,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/688.json b/data/json/SubCompanionUnlockableSkillDefinition/688.json
deleted file mode 100644
index e66d06cc72ac14467da27b21932f31991b4361af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/688.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "688",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 688,
-    "parentDataId": 376,
-    "skill": 812,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/692.json b/data/json/SubCompanionUnlockableSkillDefinition/692.json
deleted file mode 100644
index ce9e4bfe74d6f8bdddc03c43461449c41d8c76a3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/692.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "692",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 692,
-    "parentDataId": 487,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/697.json b/data/json/SubCompanionUnlockableSkillDefinition/697.json
deleted file mode 100644
index e9c37aba25a02f1e5a0009722064af464ab32ec4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/697.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "697",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 697,
-    "parentDataId": 42,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/699.json b/data/json/SubCompanionUnlockableSkillDefinition/699.json
deleted file mode 100644
index 29da48de4b175e0e1fddfc8b71e7ddd809c3edd0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/699.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "699",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 699,
-    "parentDataId": 90,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/7.json b/data/json/SubCompanionUnlockableSkillDefinition/7.json
deleted file mode 100644
index 8330c843078c75aa981cfabb0ca7c2c07e030b33..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/7.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "7",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 7,
-    "parentDataId": 144,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/70.json b/data/json/SubCompanionUnlockableSkillDefinition/70.json
deleted file mode 100644
index 1ad8706d43f336e1a6c562edbfea26f34be3657f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/70.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "70",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 70,
-    "parentDataId": 633,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/701.json b/data/json/SubCompanionUnlockableSkillDefinition/701.json
deleted file mode 100644
index c7e86745f968aa235044c917cc677144b965bb02..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/701.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "701",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 701,
-    "parentDataId": 561,
-    "skill": 958,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/702.json b/data/json/SubCompanionUnlockableSkillDefinition/702.json
deleted file mode 100644
index 37359fb3b361cfa61747b0774adcd86c5afc171e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/702.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "702",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 702,
-    "parentDataId": 229,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/703.json b/data/json/SubCompanionUnlockableSkillDefinition/703.json
deleted file mode 100644
index cdd556fc24634763586fda636b0f45f8a26cbf09..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/703.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "703",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 703,
-    "parentDataId": 256,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/704.json b/data/json/SubCompanionUnlockableSkillDefinition/704.json
deleted file mode 100644
index 018a215f8de7d43dda5bb2d991c7412441b9946f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/704.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "704",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 704,
-    "parentDataId": 99,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/705.json b/data/json/SubCompanionUnlockableSkillDefinition/705.json
deleted file mode 100644
index db494a4b671020283b26d32f2584baf5f78c6894..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/705.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "705",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 705,
-    "parentDataId": 256,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/707.json b/data/json/SubCompanionUnlockableSkillDefinition/707.json
deleted file mode 100644
index e75e1bd0f9f754f03164a03c13de0afbe488c988..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/707.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "707",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 707,
-    "parentDataId": 601,
-    "skill": 848,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/71.json b/data/json/SubCompanionUnlockableSkillDefinition/71.json
deleted file mode 100644
index 63b7225db4355c919d8785c1e0b158b7540a317a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/71.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "71",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 71,
-    "parentDataId": 191,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/710.json b/data/json/SubCompanionUnlockableSkillDefinition/710.json
deleted file mode 100644
index 9688046ed9176977c296b8009ca8e1ca1d221180..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/710.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "710",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 710,
-    "parentDataId": 792,
-    "skill": 848,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/711.json b/data/json/SubCompanionUnlockableSkillDefinition/711.json
deleted file mode 100644
index 43fff2aca9e9b7b4d2ce7075ccaf5f5452dd6100..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/711.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "711",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 711,
-    "parentDataId": 819,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/712.json b/data/json/SubCompanionUnlockableSkillDefinition/712.json
deleted file mode 100644
index 36b16924f49e22494634c7e423e4e5eab9f1452f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/712.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "712",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 712,
-    "parentDataId": 946,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/713.json b/data/json/SubCompanionUnlockableSkillDefinition/713.json
deleted file mode 100644
index e5aa18d3cf5d96b97a5383083ac6973c8c9146bd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/713.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "713",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 713,
-    "parentDataId": 72,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/717.json b/data/json/SubCompanionUnlockableSkillDefinition/717.json
deleted file mode 100644
index 90d719786166dc326fcaa474f09ee667e932706d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/717.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "717",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 717,
-    "parentDataId": 966,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/718.json b/data/json/SubCompanionUnlockableSkillDefinition/718.json
deleted file mode 100644
index eb8f9a469226235996424ce8ad145fd26aa05d85..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/718.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "718",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 718,
-    "parentDataId": 661,
-    "skill": 878,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/719.json b/data/json/SubCompanionUnlockableSkillDefinition/719.json
deleted file mode 100644
index c86a83a1f1126e634ebcad41eb63d57546db9a09..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/719.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "719",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 719,
-    "parentDataId": 231,
-    "skill": 75,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/72.json b/data/json/SubCompanionUnlockableSkillDefinition/72.json
deleted file mode 100644
index f8704f7d4ea4f567db5a0d2a58b108f7e4208123..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/72.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "72",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 72,
-    "parentDataId": 483,
-    "skill": 616,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/720.json b/data/json/SubCompanionUnlockableSkillDefinition/720.json
deleted file mode 100644
index 755623ae8c6d9818b3e4533a94e262c80f0d72d5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/720.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "720",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 720,
-    "parentDataId": 98,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/7204.json b/data/json/SubCompanionUnlockableSkillDefinition/7204.json
deleted file mode 100644
index bd9895ffc0053f00265ace2619bf836c898f27af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/7204.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "7204",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 7204,
-    "parentDataId": 897,
-    "skill": 273,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/723.json b/data/json/SubCompanionUnlockableSkillDefinition/723.json
deleted file mode 100644
index ad8ed7f584ec1c2624843298ce4fd1de284bea49..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/723.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "723",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 723,
-    "parentDataId": 689,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/724.json b/data/json/SubCompanionUnlockableSkillDefinition/724.json
deleted file mode 100644
index 6bd3bf2ecd4a0362d5a47ce8e13caa0c69609a38..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/724.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "724",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 724,
-    "parentDataId": 801,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/726.json b/data/json/SubCompanionUnlockableSkillDefinition/726.json
deleted file mode 100644
index 658f95901ee45a255763eba150a50825f8bf12fb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/726.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "726",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 726,
-    "parentDataId": 244,
-    "skill": 806,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/727.json b/data/json/SubCompanionUnlockableSkillDefinition/727.json
deleted file mode 100644
index e139ae22fe9b094f45ba8d54f330eed6cdc4265b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/727.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "727",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 727,
-    "parentDataId": 52,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/728.json b/data/json/SubCompanionUnlockableSkillDefinition/728.json
deleted file mode 100644
index 56d998c3ded5a999f51b88b7880ae3b3ec1c2af9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/728.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "728",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 728,
-    "parentDataId": 858,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/729.json b/data/json/SubCompanionUnlockableSkillDefinition/729.json
deleted file mode 100644
index 475b4c5a381ce3a8458fc78a0c347ee2e4974a79..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/729.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "729",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 729,
-    "parentDataId": 98,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/73.json b/data/json/SubCompanionUnlockableSkillDefinition/73.json
deleted file mode 100644
index 7677c5b738ec456f4fb250e058ecd4a95cc34444..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/73.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "73",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 73,
-    "parentDataId": 135,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/730.json b/data/json/SubCompanionUnlockableSkillDefinition/730.json
deleted file mode 100644
index f07e83d0f03fcd25a07fec882aee2bd006f7ab97..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/730.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "730",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 730,
-    "parentDataId": 339,
-    "skill": 136,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/731.json b/data/json/SubCompanionUnlockableSkillDefinition/731.json
deleted file mode 100644
index c37346509059a2aef92b1ccb67fc1063e5250a65..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/731.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "731",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 731,
-    "parentDataId": 276,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/732.json b/data/json/SubCompanionUnlockableSkillDefinition/732.json
deleted file mode 100644
index 6563a92144e4a1094eeef85bd92c7d58d66ed828..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/732.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "732",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 732,
-    "parentDataId": 221,
-    "skill": 231,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/733.json b/data/json/SubCompanionUnlockableSkillDefinition/733.json
deleted file mode 100644
index e61ee53f726046a4290bfc9b2a39136a6e155999..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/733.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "733",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 733,
-    "parentDataId": 568,
-    "skill": 982,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/734.json b/data/json/SubCompanionUnlockableSkillDefinition/734.json
deleted file mode 100644
index 706b3f3c4b265b971f37a47cfd6bfa0c000e86b6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/734.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "734",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 734,
-    "parentDataId": 845,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/735.json b/data/json/SubCompanionUnlockableSkillDefinition/735.json
deleted file mode 100644
index 93e1a5186e47f7f06fbfdc6b114a9c2e155cdf28..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/735.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "735",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 735,
-    "parentDataId": 601,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/736.json b/data/json/SubCompanionUnlockableSkillDefinition/736.json
deleted file mode 100644
index f5712faa608521cdcb41030743f88def3d0d1c06..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/736.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "736",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 736,
-    "parentDataId": 845,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 100
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/737.json b/data/json/SubCompanionUnlockableSkillDefinition/737.json
deleted file mode 100644
index 9ac29e03d76fe86db6cc64a543ea61df6e1ced3f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/737.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "737",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 737,
-    "parentDataId": 135,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/738.json b/data/json/SubCompanionUnlockableSkillDefinition/738.json
deleted file mode 100644
index 0729f77ee698915b13987359a7a2fc21e222bc1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/738.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "738",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 738,
-    "parentDataId": 94,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/739.json b/data/json/SubCompanionUnlockableSkillDefinition/739.json
deleted file mode 100644
index 95ba41aa85055e4e236267e3e5bbdaeb85cf617f..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/739.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "739",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 739,
-    "parentDataId": 401,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/74.json b/data/json/SubCompanionUnlockableSkillDefinition/74.json
deleted file mode 100644
index df12fe1afbd274b74b91daf6cce22df4c6c01304..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/74.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "74",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 74,
-    "parentDataId": 628,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/740.json b/data/json/SubCompanionUnlockableSkillDefinition/740.json
deleted file mode 100644
index 6363f60ad1d45cdadd1fa297fff041f91940e9a1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/740.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "740",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 740,
-    "parentDataId": 342,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/741.json b/data/json/SubCompanionUnlockableSkillDefinition/741.json
deleted file mode 100644
index 6502c23e99ad94883d293eca35d157b6ff4e2ec7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/741.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "741",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 741,
-    "parentDataId": 188,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/744.json b/data/json/SubCompanionUnlockableSkillDefinition/744.json
deleted file mode 100644
index fe527928a1ded6125d4bd2d946a00d4f1a6a1e62..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/744.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "744",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 744,
-    "parentDataId": 601,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/745.json b/data/json/SubCompanionUnlockableSkillDefinition/745.json
deleted file mode 100644
index a40ccaab66bdfe2783d1dfebdbadd2fd8c68403b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/745.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "745",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 745,
-    "parentDataId": 389,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/746.json b/data/json/SubCompanionUnlockableSkillDefinition/746.json
deleted file mode 100644
index bf8185370a3334287d5d3570dc66c3f1d6783bc7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/746.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "746",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 746,
-    "parentDataId": 94,
-    "skill": 90,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/747.json b/data/json/SubCompanionUnlockableSkillDefinition/747.json
deleted file mode 100644
index bce61aa67b5a1c5f003c32b79062c56f6ecb5b76..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/747.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "747",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 747,
-    "parentDataId": 819,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/748.json b/data/json/SubCompanionUnlockableSkillDefinition/748.json
deleted file mode 100644
index 9c6a0c5fb6308e5904f86c65af9477954f02c19d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/748.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "748",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 748,
-    "parentDataId": 807,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/75.json b/data/json/SubCompanionUnlockableSkillDefinition/75.json
deleted file mode 100644
index bcda8c2790f697d06815b8fddafe53112fa09c44..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/75.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "75",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 75,
-    "parentDataId": 946,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/750.json b/data/json/SubCompanionUnlockableSkillDefinition/750.json
deleted file mode 100644
index c50f7874b1832ee51175a6870459950e1630d9d5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/750.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "750",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 750,
-    "parentDataId": 178,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/755.json b/data/json/SubCompanionUnlockableSkillDefinition/755.json
deleted file mode 100644
index 77e012ee26cb5d4bd3e07f2cf61ee9d3e796aee9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/755.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "755",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 755,
-    "parentDataId": 124,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/757.json b/data/json/SubCompanionUnlockableSkillDefinition/757.json
deleted file mode 100644
index 6ed19d635e918441f336450d36e1dc63e9445917..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/757.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "757",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 757,
-    "parentDataId": 124,
-    "skill": 307,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/758.json b/data/json/SubCompanionUnlockableSkillDefinition/758.json
deleted file mode 100644
index e6db968497a4abb2789b83ac1ada838680f95d00..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/758.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "758",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 758,
-    "parentDataId": 657,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/759.json b/data/json/SubCompanionUnlockableSkillDefinition/759.json
deleted file mode 100644
index 149b5f55b10aa4fd8452c44f865c6cae54bc3edb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/759.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "759",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 759,
-    "parentDataId": 538,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/76.json b/data/json/SubCompanionUnlockableSkillDefinition/76.json
deleted file mode 100644
index 15de9ea4fb0ffe02f3b9959f9355e4cbb406a892..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/76.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "76",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 76,
-    "parentDataId": 664,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/760.json b/data/json/SubCompanionUnlockableSkillDefinition/760.json
deleted file mode 100644
index 239525d22fa592f579069280037e435f557295aa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/760.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "760",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 760,
-    "parentDataId": 846,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/7605.json b/data/json/SubCompanionUnlockableSkillDefinition/7605.json
deleted file mode 100644
index 50905dabf4816d0e7000fdf7ade9439f58e5d23b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/7605.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "7605",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 7605,
-    "parentDataId": 815,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/761.json b/data/json/SubCompanionUnlockableSkillDefinition/761.json
deleted file mode 100644
index 69182d68ca5134c1a6b7441d697eec5c897e7a70..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/761.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "761",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 761,
-    "parentDataId": 507,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/762.json b/data/json/SubCompanionUnlockableSkillDefinition/762.json
deleted file mode 100644
index 23514fce3ab2a1530281dfcae5dc1992fcaaeaef..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/762.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "762",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 762,
-    "parentDataId": 835,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/765.json b/data/json/SubCompanionUnlockableSkillDefinition/765.json
deleted file mode 100644
index 27442498481d04b9e21f302f3fa43c5379a6ad68..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/765.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "765",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 765,
-    "parentDataId": 83,
-    "skill": 661,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/766.json b/data/json/SubCompanionUnlockableSkillDefinition/766.json
deleted file mode 100644
index 4a046c9a0f4cbabb0908a27b870ba765f9a245c4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/766.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "766",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 766,
-    "parentDataId": 601,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/767.json b/data/json/SubCompanionUnlockableSkillDefinition/767.json
deleted file mode 100644
index 4eddedb48c4208bb8652c078f34eaa563903475d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/767.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "767",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 767,
-    "parentDataId": 555,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/768.json b/data/json/SubCompanionUnlockableSkillDefinition/768.json
deleted file mode 100644
index a08e4bba1fea21c910d50c652e8d79e75f281c17..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/768.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "768",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 768,
-    "parentDataId": 846,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/769.json b/data/json/SubCompanionUnlockableSkillDefinition/769.json
deleted file mode 100644
index 02b5a20b7a686b2822d2c7a46387cc4e0a6f4cb7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/769.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "769",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 769,
-    "parentDataId": 847,
-    "skill": 504,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/77.json b/data/json/SubCompanionUnlockableSkillDefinition/77.json
deleted file mode 100644
index 1427f80917af6e8cc60416489987c79bb2af8b6e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/77.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "77",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 77,
-    "parentDataId": 819,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/770.json b/data/json/SubCompanionUnlockableSkillDefinition/770.json
deleted file mode 100644
index dc2c6999dd90cd538308e559f3cd4be315a8b066..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/770.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "770",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 770,
-    "parentDataId": 933,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/771.json b/data/json/SubCompanionUnlockableSkillDefinition/771.json
deleted file mode 100644
index 00c0b196bf54e9e12827ab88b96dc0349492b3ce..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/771.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "771",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 771,
-    "parentDataId": 144,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/772.json b/data/json/SubCompanionUnlockableSkillDefinition/772.json
deleted file mode 100644
index 0a7805acb46b4bbdd36f27c70bd9e27d8c3cd5c6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/772.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "772",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 772,
-    "parentDataId": 666,
-    "skill": 208,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/773.json b/data/json/SubCompanionUnlockableSkillDefinition/773.json
deleted file mode 100644
index 7c745ae3f4c1dc0a90d905979f9444696fe7f3dc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/773.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "773",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 773,
-    "parentDataId": 946,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/774.json b/data/json/SubCompanionUnlockableSkillDefinition/774.json
deleted file mode 100644
index f5cf9a9361637ae20ec0d28fdd55d8ba71267f13..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/774.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "774",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 774,
-    "parentDataId": 841,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/776.json b/data/json/SubCompanionUnlockableSkillDefinition/776.json
deleted file mode 100644
index 851bf64c6e69d50b8572c989f94120138a58cc1a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/776.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "776",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 776,
-    "parentDataId": 858,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/777.json b/data/json/SubCompanionUnlockableSkillDefinition/777.json
deleted file mode 100644
index fafd158238f10adaaafd02d9f328426d139e22cd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/777.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "777",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 777,
-    "parentDataId": 846,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/778.json b/data/json/SubCompanionUnlockableSkillDefinition/778.json
deleted file mode 100644
index b328f5f49ba2a8f3a3522fee0928d01af604783c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/778.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "778",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 778,
-    "parentDataId": 72,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/7783.json b/data/json/SubCompanionUnlockableSkillDefinition/7783.json
deleted file mode 100644
index 1c132fdc093abdb5e16e959477bd3e9422f129d0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/7783.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "7783",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 7783,
-    "parentDataId": 815,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/779.json b/data/json/SubCompanionUnlockableSkillDefinition/779.json
deleted file mode 100644
index 81cd0db5b3fd1555b75090716c13fa2dbed57f97..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/779.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "779",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 779,
-    "parentDataId": 42,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/78.json b/data/json/SubCompanionUnlockableSkillDefinition/78.json
deleted file mode 100644
index fa3d464fafcaf4f37003880beee55b679727a3a1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/78.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "78",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 78,
-    "parentDataId": 568,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/781.json b/data/json/SubCompanionUnlockableSkillDefinition/781.json
deleted file mode 100644
index e39556c1d15fb7be2ac3e5f0b2edd8ca6034e31a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/781.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "781",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 781,
-    "parentDataId": 815,
-    "skill": 414,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/782.json b/data/json/SubCompanionUnlockableSkillDefinition/782.json
deleted file mode 100644
index 82aa2d5c59dc093e8bbef6e2ba7a471ca9de5267..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/782.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "782",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 782,
-    "parentDataId": 832,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/783.json b/data/json/SubCompanionUnlockableSkillDefinition/783.json
deleted file mode 100644
index cf111f0a379bccd960ecea5700692ebd2bccc5cc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/783.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "783",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 783,
-    "parentDataId": 745,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/784.json b/data/json/SubCompanionUnlockableSkillDefinition/784.json
deleted file mode 100644
index ebac966a783665e2ab52dc1f5e52fee6539de4f9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/784.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "784",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 784,
-    "parentDataId": 858,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/788.json b/data/json/SubCompanionUnlockableSkillDefinition/788.json
deleted file mode 100644
index 7d3a1aa05110b56a9e9306bdfeb984afc18341af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/788.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "788",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 788,
-    "parentDataId": 339,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/789.json b/data/json/SubCompanionUnlockableSkillDefinition/789.json
deleted file mode 100644
index e53a02e06affd9dc53c383e97ebd240a276d82f4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/789.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "789",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 789,
-    "parentDataId": 633,
-    "skill": 41,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/790.json b/data/json/SubCompanionUnlockableSkillDefinition/790.json
deleted file mode 100644
index 2bf649bba6b16ed0d1d20151904c97414b82c9db..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/790.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "790",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 790,
-    "parentDataId": 832,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/791.json b/data/json/SubCompanionUnlockableSkillDefinition/791.json
deleted file mode 100644
index f1deea0604dd09c5bb01ee383fa1e09cc1c5e207..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/791.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "791",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 791,
-    "parentDataId": 90,
-    "skill": 179,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 120
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 4
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/792.json b/data/json/SubCompanionUnlockableSkillDefinition/792.json
deleted file mode 100644
index 6ef8c1eb26b4209bea855297c2c0b0e42fd1dbfa..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/792.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "792",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 792,
-    "parentDataId": 61,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/793.json b/data/json/SubCompanionUnlockableSkillDefinition/793.json
deleted file mode 100644
index 7ae57a57d725e8b6e472f3700258648084d6783d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/793.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "793",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 793,
-    "parentDataId": 633,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/794.json b/data/json/SubCompanionUnlockableSkillDefinition/794.json
deleted file mode 100644
index c1ca37cfe5ba994f99dc4af8ea8d415d92eeeadf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/794.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "794",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 794,
-    "parentDataId": 769,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/795.json b/data/json/SubCompanionUnlockableSkillDefinition/795.json
deleted file mode 100644
index 53b27e719b67f0fa37eab6c600c47fee6f2b5313..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/795.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "795",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 795,
-    "parentDataId": 897,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 125
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 6
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/796.json b/data/json/SubCompanionUnlockableSkillDefinition/796.json
deleted file mode 100644
index 1dc1d26ff9b1eda7be1b3ea04c8803a5f597c69b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/796.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "796",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 796,
-    "parentDataId": 124,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/797.json b/data/json/SubCompanionUnlockableSkillDefinition/797.json
deleted file mode 100644
index 09f50fc27bae46803696140dc159674912ca7d92..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/797.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "797",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 797,
-    "parentDataId": 339,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/799.json b/data/json/SubCompanionUnlockableSkillDefinition/799.json
deleted file mode 100644
index b89f73aa052e7cac1b9ba9bbfb159a7c81c53da3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/799.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "799",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 799,
-    "parentDataId": 657,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/8.json b/data/json/SubCompanionUnlockableSkillDefinition/8.json
deleted file mode 100644
index 718e2ca99b975cd8ea831744b55c7eb17e9d1a56..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/8.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "8",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 8,
-    "parentDataId": 946,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/801.json b/data/json/SubCompanionUnlockableSkillDefinition/801.json
deleted file mode 100644
index 096368c0b717ffdacefc322eef8a7e0b228c63f1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/801.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "801",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 801,
-    "parentDataId": 835,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/807.json b/data/json/SubCompanionUnlockableSkillDefinition/807.json
deleted file mode 100644
index defe3361daf0959181400e31d16809415de94037..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/807.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "807",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 807,
-    "parentDataId": 666,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/810.json b/data/json/SubCompanionUnlockableSkillDefinition/810.json
deleted file mode 100644
index b39225b9c9dbe4456518f156b029cdc6f67875b8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/810.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "810",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 810,
-    "parentDataId": 231,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/811.json b/data/json/SubCompanionUnlockableSkillDefinition/811.json
deleted file mode 100644
index 1eea52b23ee946556b92c94df666067493658769..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/811.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "811",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 811,
-    "parentDataId": 689,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/812.json b/data/json/SubCompanionUnlockableSkillDefinition/812.json
deleted file mode 100644
index a3c7958399ecd4949d5567e751a02de4125bbbd2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/812.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "812",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 812,
-    "parentDataId": 841,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/813.json b/data/json/SubCompanionUnlockableSkillDefinition/813.json
deleted file mode 100644
index 85505a8fffa644a4b71290d0418f1893543602fb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/813.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "813",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 813,
-    "parentDataId": 98,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/814.json b/data/json/SubCompanionUnlockableSkillDefinition/814.json
deleted file mode 100644
index e0584acbe041b846d8fe3e00d31d7cb14f148b4b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/814.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "814",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 814,
-    "parentDataId": 835,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/818.json b/data/json/SubCompanionUnlockableSkillDefinition/818.json
deleted file mode 100644
index 1f1f79c7286ac7fa9030ae72dcdf3b88f56b8c77..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/818.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "818",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 818,
-    "parentDataId": 642,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/819.json b/data/json/SubCompanionUnlockableSkillDefinition/819.json
deleted file mode 100644
index 5d4a70e1a3290bab2684472a8a7111b1fd02143a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/819.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "819",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 819,
-    "parentDataId": 52,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/82.json b/data/json/SubCompanionUnlockableSkillDefinition/82.json
deleted file mode 100644
index 916c67d433b3480f4b4a4c7ee463f4fe5101359c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/82.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "82",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 82,
-    "parentDataId": 802,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/820.json b/data/json/SubCompanionUnlockableSkillDefinition/820.json
deleted file mode 100644
index 675caf63fd4940d9a7aa7aa3aedee9e23be7c30c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/820.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "820",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 820,
-    "parentDataId": 555,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/821.json b/data/json/SubCompanionUnlockableSkillDefinition/821.json
deleted file mode 100644
index 882ed66d1d9212e16e6067452f4ed2778a5544dc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/821.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "821",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 821,
-    "parentDataId": 483,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/822.json b/data/json/SubCompanionUnlockableSkillDefinition/822.json
deleted file mode 100644
index e53cf44480d6ba711efbdb7eb3f74b965637e797..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/822.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "822",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 822,
-    "parentDataId": 42,
-    "skill": 494,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/824.json b/data/json/SubCompanionUnlockableSkillDefinition/824.json
deleted file mode 100644
index f499a7734ede8e139eb0d0c4186f5adda5881f98..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/824.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "824",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 824,
-    "parentDataId": 276,
-    "skill": 998,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/826.json b/data/json/SubCompanionUnlockableSkillDefinition/826.json
deleted file mode 100644
index a212641a618506c63d3c325ea632aa079a126388..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/826.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "826",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 826,
-    "parentDataId": 176,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/827.json b/data/json/SubCompanionUnlockableSkillDefinition/827.json
deleted file mode 100644
index 4e59a13c37bb6c7d86861395b3091e1b739ac39a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/827.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "827",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 827,
-    "parentDataId": 215,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/828.json b/data/json/SubCompanionUnlockableSkillDefinition/828.json
deleted file mode 100644
index 1a7f97cc5417fadf5b0e8eafb9de24b5d7f7aae4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/828.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "828",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 828,
-    "parentDataId": 188,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/829.json b/data/json/SubCompanionUnlockableSkillDefinition/829.json
deleted file mode 100644
index 491360b4ff070f61c661b5ec4d2ef9631ba22cab..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/829.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "829",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 829,
-    "parentDataId": 847,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/830.json b/data/json/SubCompanionUnlockableSkillDefinition/830.json
deleted file mode 100644
index 76204985dbfbdac9558544f82c2d504188a136bf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/830.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "830",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 830,
-    "parentDataId": 745,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/831.json b/data/json/SubCompanionUnlockableSkillDefinition/831.json
deleted file mode 100644
index af49dc98c86fbf6b9f055579df81fd958d0851cb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/831.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "831",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 831,
-    "parentDataId": 124,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/837.json b/data/json/SubCompanionUnlockableSkillDefinition/837.json
deleted file mode 100644
index bb39b639990333e1d87fb234d595b60c9bfc7619..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/837.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "837",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 837,
-    "parentDataId": 933,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/839.json b/data/json/SubCompanionUnlockableSkillDefinition/839.json
deleted file mode 100644
index aaaffce05eb73e11df63272d8f3a38348d5e5d9b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/839.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "839",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 839,
-    "parentDataId": 188,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/84.json b/data/json/SubCompanionUnlockableSkillDefinition/84.json
deleted file mode 100644
index 0c9761c53be169ff342b3e70ceb31b4a694e6fa9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/84.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "84",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 84,
-    "parentDataId": 819,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/841.json b/data/json/SubCompanionUnlockableSkillDefinition/841.json
deleted file mode 100644
index d6028211b2e389c855bf1640871179995bc2684d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/841.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "841",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 841,
-    "parentDataId": 215,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/842.json b/data/json/SubCompanionUnlockableSkillDefinition/842.json
deleted file mode 100644
index 22ff902448c2cac984e73913951cdc4b585af888..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/842.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "842",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 842,
-    "parentDataId": 666,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/843.json b/data/json/SubCompanionUnlockableSkillDefinition/843.json
deleted file mode 100644
index 76adfddb4f1835170c7ee8a2bbd3da1f160a08a4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/843.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "843",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 843,
-    "parentDataId": 950,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/845.json b/data/json/SubCompanionUnlockableSkillDefinition/845.json
deleted file mode 100644
index cccdf1669e5ed5e67faa33f4bafd9c90fd48e44b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/845.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "845",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 845,
-    "parentDataId": 215,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/846.json b/data/json/SubCompanionUnlockableSkillDefinition/846.json
deleted file mode 100644
index b843a6d685a5dc00ad75967a78c43fd5927106ef..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/846.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "846",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 846,
-    "parentDataId": 52,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/847.json b/data/json/SubCompanionUnlockableSkillDefinition/847.json
deleted file mode 100644
index c838effa87e7eca310cf426acd78bd88c0caf50b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/847.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "847",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 847,
-    "parentDataId": 657,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/849.json b/data/json/SubCompanionUnlockableSkillDefinition/849.json
deleted file mode 100644
index 8bc2a71fcecb36249479f1a3896c7a7a11ae5c48..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/849.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "849",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 849,
-    "parentDataId": 769,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/850.json b/data/json/SubCompanionUnlockableSkillDefinition/850.json
deleted file mode 100644
index c863ec46d1bf6ae3ada17516ed35c3f5a1f08917..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/850.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "850",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 850,
-    "parentDataId": 221,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/8506.json b/data/json/SubCompanionUnlockableSkillDefinition/8506.json
deleted file mode 100644
index 1a0b4d0741d50de052bf6a2c84e2a432507075d6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/8506.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "8506",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 8506,
-    "parentDataId": 359,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/8535.json b/data/json/SubCompanionUnlockableSkillDefinition/8535.json
deleted file mode 100644
index 5dd40d3e9e8f347a4690b6e012f77366faaafff3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/8535.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "8535",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 8535,
-    "parentDataId": 633,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/854.json b/data/json/SubCompanionUnlockableSkillDefinition/854.json
deleted file mode 100644
index 74cafc2c0c141ebba4e683c47e58bb6f9dd0efa7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/854.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "854",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 854,
-    "parentDataId": 950,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/8549.json b/data/json/SubCompanionUnlockableSkillDefinition/8549.json
deleted file mode 100644
index d872c90ad4602fbb24682231cc5cbe252dc21cd2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/8549.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "8549",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 8549,
-    "parentDataId": 99,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/855.json b/data/json/SubCompanionUnlockableSkillDefinition/855.json
deleted file mode 100644
index fa967c413bedf8700cadbeff642ceda6099e3fcf..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/855.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "855",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 855,
-    "parentDataId": 815,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/856.json b/data/json/SubCompanionUnlockableSkillDefinition/856.json
deleted file mode 100644
index 2b1b7ffe020795acd954193e516ed61fb53e002a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/856.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "856",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 856,
-    "parentDataId": 538,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/857.json b/data/json/SubCompanionUnlockableSkillDefinition/857.json
deleted file mode 100644
index 95a30ff79b66a7d233364c520767eb2a479d3fc4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/857.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "857",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 857,
-    "parentDataId": 538,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/858.json b/data/json/SubCompanionUnlockableSkillDefinition/858.json
deleted file mode 100644
index 441e4246af8ace017c3ce448f26137a3275e9404..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/858.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "858",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 858,
-    "parentDataId": 778,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/859.json b/data/json/SubCompanionUnlockableSkillDefinition/859.json
deleted file mode 100644
index 59de541d8fbc1f4201c7b73295b13b8d1bfbde81..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/859.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "859",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 859,
-    "parentDataId": 846,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/860.json b/data/json/SubCompanionUnlockableSkillDefinition/860.json
deleted file mode 100644
index 3047ea53aa489485722bb5f37b8792b7e05ae078..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/860.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "860",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 860,
-    "parentDataId": 666,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/861.json b/data/json/SubCompanionUnlockableSkillDefinition/861.json
deleted file mode 100644
index 5700661b390027adcdad03c1ee6a15d009687f7c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/861.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "861",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 861,
-    "parentDataId": 144,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/862.json b/data/json/SubCompanionUnlockableSkillDefinition/862.json
deleted file mode 100644
index 41ba57e977b61d8e32bffc3c0c18e8e5dd48eb98..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/862.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "862",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 862,
-    "parentDataId": 689,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/863.json b/data/json/SubCompanionUnlockableSkillDefinition/863.json
deleted file mode 100644
index 9027c5c26ed2d0800622f2cf309f99a9b4efa0d4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/863.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "863",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 863,
-    "parentDataId": 568,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/864.json b/data/json/SubCompanionUnlockableSkillDefinition/864.json
deleted file mode 100644
index 14157ed8a86eaed68de183a21e1aa84e3d95d3d7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/864.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "864",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 864,
-    "parentDataId": 661,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/865.json b/data/json/SubCompanionUnlockableSkillDefinition/865.json
deleted file mode 100644
index 7104644053c881e7cd6b6f76ae479603b82c9c3e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/865.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "865",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 865,
-    "parentDataId": 244,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/866.json b/data/json/SubCompanionUnlockableSkillDefinition/866.json
deleted file mode 100644
index 3ff8be45cd1e428d202bd34717cbb965e5cc5b9a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/866.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "866",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 866,
-    "parentDataId": 819,
-    "skill": 841,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/867.json b/data/json/SubCompanionUnlockableSkillDefinition/867.json
deleted file mode 100644
index d132023dce255440857691bf033afefb4a7cfd7d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/867.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "867",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 867,
-    "parentDataId": 144,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/868.json b/data/json/SubCompanionUnlockableSkillDefinition/868.json
deleted file mode 100644
index 704fcc73a64beaedb23b46c394d2a3cdf2ca4375..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/868.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "868",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 868,
-    "parentDataId": 847,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/869.json b/data/json/SubCompanionUnlockableSkillDefinition/869.json
deleted file mode 100644
index 8a85e99610b3a24b76c61648370b644b50f44645..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/869.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "869",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 869,
-    "parentDataId": 339,
-    "skill": 921,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/87.json b/data/json/SubCompanionUnlockableSkillDefinition/87.json
deleted file mode 100644
index f79dfc2499de62347f28be277084b80a13547f62..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/87.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "87",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 87,
-    "parentDataId": 178,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/871.json b/data/json/SubCompanionUnlockableSkillDefinition/871.json
deleted file mode 100644
index 15e44adf93e088cbfdb6d9d373246e1627872bc3..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/871.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "871",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 871,
-    "parentDataId": 689,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 80
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 2
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/872.json b/data/json/SubCompanionUnlockableSkillDefinition/872.json
deleted file mode 100644
index 927f0be83fa18b9bcd366dfaf831fade81eaf274..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/872.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "872",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 872,
-    "parentDataId": 601,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/873.json b/data/json/SubCompanionUnlockableSkillDefinition/873.json
deleted file mode 100644
index c91d527a0a57d2cfb102941ea201e60ea32f6900..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/873.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "873",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 873,
-    "parentDataId": 98,
-    "skill": 710,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/874.json b/data/json/SubCompanionUnlockableSkillDefinition/874.json
deleted file mode 100644
index 9acebf24f5a7b392df18cb44c51b9bbf49da0506..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/874.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "874",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 874,
-    "parentDataId": 144,
-    "skill": 450,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/875.json b/data/json/SubCompanionUnlockableSkillDefinition/875.json
deleted file mode 100644
index d17a25bb602abfbe0320b1f5000bd1c4c4fd2e11..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/875.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "875",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 875,
-    "parentDataId": 188,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/877.json b/data/json/SubCompanionUnlockableSkillDefinition/877.json
deleted file mode 100644
index c086c6cdace8751aad89ef31b1773e88362a5e0d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/877.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "877",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 877,
-    "parentDataId": 135,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/878.json b/data/json/SubCompanionUnlockableSkillDefinition/878.json
deleted file mode 100644
index ff59a9f01e60bf49d6e0f19a163348173627d215..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/878.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "878",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 878,
-    "parentDataId": 946,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/879.json b/data/json/SubCompanionUnlockableSkillDefinition/879.json
deleted file mode 100644
index 87373c3d1d9c935f7f115479d38d8a4969f8c02c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/879.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "879",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 879,
-    "parentDataId": 966,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/881.json b/data/json/SubCompanionUnlockableSkillDefinition/881.json
deleted file mode 100644
index cff08a2971e4fca2cfb3c03723111a1141e4b217..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/881.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "881",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 881,
-    "parentDataId": 98,
-    "skill": 723,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/885.json b/data/json/SubCompanionUnlockableSkillDefinition/885.json
deleted file mode 100644
index cac9e3e9e40e007d67b89d33014f16df4ed0f661..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/885.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "885",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 885,
-    "parentDataId": 94,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/89.json b/data/json/SubCompanionUnlockableSkillDefinition/89.json
deleted file mode 100644
index b8529d56a9e53a8ce5418ea5dce966975db4cf3b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/89.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "89",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 89,
-    "parentDataId": 72,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/890.json b/data/json/SubCompanionUnlockableSkillDefinition/890.json
deleted file mode 100644
index 71d5572415fb16fbb9bc7d740635c33b05fe7db4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/890.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "890",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 890,
-    "parentDataId": 135,
-    "skill": 567,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/891.json b/data/json/SubCompanionUnlockableSkillDefinition/891.json
deleted file mode 100644
index fef27780cfb5861467b2fa94e292908506027bdd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/891.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "891",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 891,
-    "parentDataId": 628,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/892.json b/data/json/SubCompanionUnlockableSkillDefinition/892.json
deleted file mode 100644
index 233f4d4aa0d0037f9976d5728d0349e1140480bb..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/892.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "892",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 892,
-    "parentDataId": 98,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/893.json b/data/json/SubCompanionUnlockableSkillDefinition/893.json
deleted file mode 100644
index 7be0a3223986d7c96683e70c73490a22227b2441..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/893.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "893",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 893,
-    "parentDataId": 144,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/894.json b/data/json/SubCompanionUnlockableSkillDefinition/894.json
deleted file mode 100644
index 10d2ff828a7310d54b2c07e5b77da049dd4f4f27..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/894.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "894",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 894,
-    "parentDataId": 483,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/8959.json b/data/json/SubCompanionUnlockableSkillDefinition/8959.json
deleted file mode 100644
index 37b344ae4d9d53efcff6642e9c5cb17417ab5bbc..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/8959.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "8959",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 8959,
-    "parentDataId": 99,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/896.json b/data/json/SubCompanionUnlockableSkillDefinition/896.json
deleted file mode 100644
index 75dc4ab1d2e42a9804db6c5bb26e6c950f813bcd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/896.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "896",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 896,
-    "parentDataId": 507,
-    "skill": 281,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 100
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/899.json b/data/json/SubCompanionUnlockableSkillDefinition/899.json
deleted file mode 100644
index 59c4fc61bb1b2d8962a9c5c26a3a543a83d4e96d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/899.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "899",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 899,
-    "parentDataId": 753,
-    "skill": 816,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/9.json b/data/json/SubCompanionUnlockableSkillDefinition/9.json
deleted file mode 100644
index 1cac9c04329c0f29d5295edd662adebe64119449..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/9.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "9",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 9,
-    "parentDataId": 819,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/90.json b/data/json/SubCompanionUnlockableSkillDefinition/90.json
deleted file mode 100644
index 4ad5593ce2d2960c513f8d6bb61baf11d372665a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/90.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "90",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 90,
-    "parentDataId": 933,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/900.json b/data/json/SubCompanionUnlockableSkillDefinition/900.json
deleted file mode 100644
index 04e89d520410fed54cb5ea9f7045ef47afd7265e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/900.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "900",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 900,
-    "parentDataId": 492,
-    "skill": 793,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/906.json b/data/json/SubCompanionUnlockableSkillDefinition/906.json
deleted file mode 100644
index 547e631d8d7081d2da38c3f64ecba15e7ef5e6ff..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/906.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "906",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 906,
-    "parentDataId": 841,
-    "skill": 528,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/907.json b/data/json/SubCompanionUnlockableSkillDefinition/907.json
deleted file mode 100644
index d3454494f6afbdd1a5218babc6b85899bedf7c35..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/907.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "907",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 907,
-    "parentDataId": 144,
-    "skill": 117,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/91.json b/data/json/SubCompanionUnlockableSkillDefinition/91.json
deleted file mode 100644
index a52f533ded3cb4cb258e53ff5633f481a23a5c10..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/91.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "91",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 91,
-    "parentDataId": 792,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/910.json b/data/json/SubCompanionUnlockableSkillDefinition/910.json
deleted file mode 100644
index c4858f8fd8ad8e7dbcdc1846e281b96d0a76c8d2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/910.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "910",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 910,
-    "parentDataId": 244,
-    "skill": 848,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/912.json b/data/json/SubCompanionUnlockableSkillDefinition/912.json
deleted file mode 100644
index 994a08c5a911d6285d59fec40cb0f323ad229c38..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/912.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "912",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 912,
-    "parentDataId": 191,
-    "skill": 636,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/913.json b/data/json/SubCompanionUnlockableSkillDefinition/913.json
deleted file mode 100644
index 526b2a0e5331011f14e7fc8d99e44807ecbe4a62..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/913.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "913",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 913,
-    "parentDataId": 276,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/914.json b/data/json/SubCompanionUnlockableSkillDefinition/914.json
deleted file mode 100644
index e6670d39791ed8d5dc413f3c45629a10fd838ec6..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/914.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "914",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 914,
-    "parentDataId": 815,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/915.json b/data/json/SubCompanionUnlockableSkillDefinition/915.json
deleted file mode 100644
index dea988f013cdfdcc7e492ca699097717529d9d42..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/915.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "915",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 915,
-    "parentDataId": 753,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/916.json b/data/json/SubCompanionUnlockableSkillDefinition/916.json
deleted file mode 100644
index 07b3ad8ada221e51b9817907dcac1e11dfb52ed0..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/916.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "916",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 916,
-    "parentDataId": 61,
-    "skill": 490,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/917.json b/data/json/SubCompanionUnlockableSkillDefinition/917.json
deleted file mode 100644
index fd91c6831afedbd8fdb89f88dcf89db2a2d4d507..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/917.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "917",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 917,
-    "parentDataId": 538,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/918.json b/data/json/SubCompanionUnlockableSkillDefinition/918.json
deleted file mode 100644
index 7f46c8ee9fc0f7fe4149598a1c3fb70ece03263b..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/918.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "918",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 918,
-    "parentDataId": 769,
-    "skill": 130,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/919.json b/data/json/SubCompanionUnlockableSkillDefinition/919.json
deleted file mode 100644
index 532c9b26eba8ca6080dcafb838450db4745691d2..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/919.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "919",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 919,
-    "parentDataId": 568,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/92.json b/data/json/SubCompanionUnlockableSkillDefinition/92.json
deleted file mode 100644
index cfa9e177b8dbb118060e95939581d2ccc5e9732a..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/92.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "92",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 92,
-    "parentDataId": 568,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/920.json b/data/json/SubCompanionUnlockableSkillDefinition/920.json
deleted file mode 100644
index 94f05e83758b6f9939f3ecc8840761dc57bf60ac..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/920.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "920",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 920,
-    "parentDataId": 666,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/921.json b/data/json/SubCompanionUnlockableSkillDefinition/921.json
deleted file mode 100644
index d9bbf1136536c29f8491d00de1175d42e94dfb66..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/921.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "921",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 921,
-    "parentDataId": 231,
-    "skill": 84,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/922.json b/data/json/SubCompanionUnlockableSkillDefinition/922.json
deleted file mode 100644
index a7a16f8ceb445a1d8a1654b692dbc1cd06dd7b63..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/922.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "922",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 922,
-    "parentDataId": 601,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/923.json b/data/json/SubCompanionUnlockableSkillDefinition/923.json
deleted file mode 100644
index 127ae5656ed35a6f1bd49abe7341a08b4938a89e..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/923.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "923",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 923,
-    "parentDataId": 276,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/926.json b/data/json/SubCompanionUnlockableSkillDefinition/926.json
deleted file mode 100644
index e11b7bcca586e2cd4141937853e0c36e557ea4b4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/926.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "926",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 926,
-    "parentDataId": 801,
-    "skill": 335,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 873
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/9288.json b/data/json/SubCompanionUnlockableSkillDefinition/9288.json
deleted file mode 100644
index 4f7de94434262d480b11fba401c32123ac92aa47..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/9288.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "9288",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 9288,
-    "parentDataId": 807,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/93.json b/data/json/SubCompanionUnlockableSkillDefinition/93.json
deleted file mode 100644
index 528482abfb8f7fde8d9bf58eed06674129015a36..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/93.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "93",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 93,
-    "parentDataId": 601,
-    "skill": 206,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/931.json b/data/json/SubCompanionUnlockableSkillDefinition/931.json
deleted file mode 100644
index 44dd717567b61fd0d0b1fc29a8f7997f7a0a4240..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/931.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "931",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 931,
-    "parentDataId": 144,
-    "skill": 431,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/932.json b/data/json/SubCompanionUnlockableSkillDefinition/932.json
deleted file mode 100644
index 3faa7e90dfe6681d67f1aa9e36d9081d758edb70..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/932.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "932",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 932,
-    "parentDataId": 847,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/934.json b/data/json/SubCompanionUnlockableSkillDefinition/934.json
deleted file mode 100644
index b762801ce2f29b0daa62c01747a24516b37317d9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/934.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "934",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 934,
-    "parentDataId": 359,
-    "skill": 848,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/937.json b/data/json/SubCompanionUnlockableSkillDefinition/937.json
deleted file mode 100644
index 29af6616d4e7e54fad12f75347002132f5ac7519..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/937.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "937",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 937,
-    "parentDataId": 42,
-    "skill": 892,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/938.json b/data/json/SubCompanionUnlockableSkillDefinition/938.json
deleted file mode 100644
index 366dee461cbdac49eee63d7efc5abcbe75cfa065..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/938.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "938",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 938,
-    "parentDataId": 135,
-    "skill": 959,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/939.json b/data/json/SubCompanionUnlockableSkillDefinition/939.json
deleted file mode 100644
index db2d74a683b701d323ed271fedca9c0dd22674d9..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/939.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "939",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 939,
-    "parentDataId": 221,
-    "skill": 995,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/941.json b/data/json/SubCompanionUnlockableSkillDefinition/941.json
deleted file mode 100644
index 00d2967ddba10b023405f25a0884a2c3b62dd424..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/941.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "941",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 941,
-    "parentDataId": 376,
-    "skill": 848,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/942.json b/data/json/SubCompanionUnlockableSkillDefinition/942.json
deleted file mode 100644
index ae47634cfb35c96e7f38203df10c7656c4d0f588..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/942.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "942",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 942,
-    "parentDataId": 841,
-    "skill": 527,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 2000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 200
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 10
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/943.json b/data/json/SubCompanionUnlockableSkillDefinition/943.json
deleted file mode 100644
index 0be93dec4cabd3f91ce98e5258f42884691bead1..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/943.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "943",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 943,
-    "parentDataId": 42,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/945.json b/data/json/SubCompanionUnlockableSkillDefinition/945.json
deleted file mode 100644
index a3655904d8215853682060890cbd023d445c7c54..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/945.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "945",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 945,
-    "parentDataId": 401,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/95.json b/data/json/SubCompanionUnlockableSkillDefinition/95.json
deleted file mode 100644
index bc2f1ff65361d043737fea1a86bb24eb2d5f629d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/95.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "95",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 95,
-    "parentDataId": 841,
-    "skill": 664,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/9516.json b/data/json/SubCompanionUnlockableSkillDefinition/9516.json
deleted file mode 100644
index 32db1cd1fd6f828c556c2fc7df4fb81af34a280c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/9516.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "9516",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 9516,
-    "parentDataId": 807,
-    "skill": 195,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/953.json b/data/json/SubCompanionUnlockableSkillDefinition/953.json
deleted file mode 100644
index 7998ad2088b0016ae0e403dc72f57d8eb8e09441..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/953.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "953",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 953,
-    "parentDataId": 98,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/956.json b/data/json/SubCompanionUnlockableSkillDefinition/956.json
deleted file mode 100644
index 820945d36108b1d26ce4687d7852c005891991ca..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/956.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "956",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 956,
-    "parentDataId": 507,
-    "skill": 386,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 15
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/957.json b/data/json/SubCompanionUnlockableSkillDefinition/957.json
deleted file mode 100644
index 9a86228c7f8312949fccbe752ad22e307bf838a5..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/957.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "957",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 957,
-    "parentDataId": 483,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 419
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/96.json b/data/json/SubCompanionUnlockableSkillDefinition/96.json
deleted file mode 100644
index b2a8d1d43d6a27ea835c91d819e638bf70a611a7..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/96.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "96",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 96,
-    "parentDataId": 191,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/960.json b/data/json/SubCompanionUnlockableSkillDefinition/960.json
deleted file mode 100644
index 8cf65eb2563eea832605d26f8a2c4d15fc8cd852..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/960.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "960",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 960,
-    "parentDataId": 628,
-    "skill": 29,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/961.json b/data/json/SubCompanionUnlockableSkillDefinition/961.json
deleted file mode 100644
index dfa17925ef85266522e9cda14a0661675433d53d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/961.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "961",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 961,
-    "parentDataId": 769,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/962.json b/data/json/SubCompanionUnlockableSkillDefinition/962.json
deleted file mode 100644
index e123b0ea48700704cca03349d8e2aa97480e4149..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/962.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "962",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 962,
-    "parentDataId": 507,
-    "skill": 396,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/966.json b/data/json/SubCompanionUnlockableSkillDefinition/966.json
deleted file mode 100644
index 256a4dc16d91f0e11ffa3fd63b638a71ee9b1fca..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/966.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "966",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 966,
-    "parentDataId": 897,
-    "skill": 303,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/968.json b/data/json/SubCompanionUnlockableSkillDefinition/968.json
deleted file mode 100644
index 6188c088bd6c2bc6eddc209a32f8fb461903c0af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/968.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "968",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 968,
-    "parentDataId": 966,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/970.json b/data/json/SubCompanionUnlockableSkillDefinition/970.json
deleted file mode 100644
index 92ff607ea4b6aae41c2779eaa3c82aca4a7e1866..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/970.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "970",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 970,
-    "parentDataId": 492,
-    "skill": 315,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/972.json b/data/json/SubCompanionUnlockableSkillDefinition/972.json
deleted file mode 100644
index 10639275addb121b0434a007f1ccd7fb5bf12681..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/972.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "972",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 972,
-    "parentDataId": 83,
-    "skill": 359,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/974.json b/data/json/SubCompanionUnlockableSkillDefinition/974.json
deleted file mode 100644
index eb2b81c7b2f92420a6003ab88c834deb5446683c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/974.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "974",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 974,
-    "parentDataId": 316,
-    "skill": 321,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 20
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/975.json b/data/json/SubCompanionUnlockableSkillDefinition/975.json
deleted file mode 100644
index 65f4c96772774eb6dc88b846f52244555a51a997..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/975.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "975",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 975,
-    "parentDataId": 98,
-    "skill": 434,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/976.json b/data/json/SubCompanionUnlockableSkillDefinition/976.json
deleted file mode 100644
index 440ca11792ff49057b8e8ba348b3249722c0ef66..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/976.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "976",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 976,
-    "parentDataId": 389,
-    "skill": 10828,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/977.json b/data/json/SubCompanionUnlockableSkillDefinition/977.json
deleted file mode 100644
index be089b19a7232ab1e890845da34bf104a8959ae4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/977.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "977",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 977,
-    "parentDataId": 555,
-    "skill": 123,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/978.json b/data/json/SubCompanionUnlockableSkillDefinition/978.json
deleted file mode 100644
index 2803470064c657f4973ad2a6dd6e4e80a366be67..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/978.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "978",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 978,
-    "parentDataId": 801,
-    "skill": 806,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 30
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/979.json b/data/json/SubCompanionUnlockableSkillDefinition/979.json
deleted file mode 100644
index e23b4c6f74789fddc14d1e000286c285db5c9324..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/979.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "979",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 979,
-    "parentDataId": 483,
-    "skill": 2543,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 1500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 150
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 41
-        },
-        "amount": 7
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/98.json b/data/json/SubCompanionUnlockableSkillDefinition/98.json
deleted file mode 100644
index 49ffd04b419ce0d51ba53306299b0d3351bb516d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/98.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "98",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 98,
-    "parentDataId": 802,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/980.json b/data/json/SubCompanionUnlockableSkillDefinition/980.json
deleted file mode 100644
index 09e2ff1d0d4bfb26b64f68ff489c5f9bc7e3f722..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/980.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "980",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 980,
-    "parentDataId": 316,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 40
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/983.json b/data/json/SubCompanionUnlockableSkillDefinition/983.json
deleted file mode 100644
index 6c9ee27c303e584154252c61fc93c3f0d2869af4..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/983.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "983",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 983,
-    "parentDataId": 483,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/984.json b/data/json/SubCompanionUnlockableSkillDefinition/984.json
deleted file mode 100644
index ec1e1e8e3c33d493dc4080d6608e62f1154fae30..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/984.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "984",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 984,
-    "parentDataId": 42,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/986.json b/data/json/SubCompanionUnlockableSkillDefinition/986.json
deleted file mode 100644
index d6a4b3c351c9411023bd876a9300aeed58d09be8..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/986.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "986",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 986,
-    "parentDataId": 745,
-    "skill": 830,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 1000
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 100
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 532
-        },
-        "amount": 5
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/988.json b/data/json/SubCompanionUnlockableSkillDefinition/988.json
deleted file mode 100644
index ab5cd87fce2bcbb61d0413259695b409b55bdf92..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/988.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "988",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 988,
-    "parentDataId": 188,
-    "skill": 109,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/99.json b/data/json/SubCompanionUnlockableSkillDefinition/99.json
deleted file mode 100644
index 90c08cf1ba9079d4c70e322ee504220f4c88d575..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/99.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "99",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 99,
-    "parentDataId": 568,
-    "skill": 527,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 500
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 50
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/991.json b/data/json/SubCompanionUnlockableSkillDefinition/991.json
deleted file mode 100644
index 1c2d35fd1e95e9e9faae71b31779028cf03f425c..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/991.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "991",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 991,
-    "parentDataId": 753,
-    "skill": 27,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/992.json b/data/json/SubCompanionUnlockableSkillDefinition/992.json
deleted file mode 100644
index 70f9f091017db8f092e489a168317153af66e7cd..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/992.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "992",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 992,
-    "parentDataId": 601,
-    "skill": 870,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 70
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/993.json b/data/json/SubCompanionUnlockableSkillDefinition/993.json
deleted file mode 100644
index 5b10600d458ea69ffcdaa6d0466ce5637436adad..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/993.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "993",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 993,
-    "parentDataId": 401,
-    "skill": 524,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 600
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 728
-        },
-        "amount": 3
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/994.json b/data/json/SubCompanionUnlockableSkillDefinition/994.json
deleted file mode 100644
index cce9484c07849fae385a116a4eead3b2095b4815..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/994.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "994",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 994,
-    "parentDataId": 538,
-    "skill": 606,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 222
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 286
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/995.json b/data/json/SubCompanionUnlockableSkillDefinition/995.json
deleted file mode 100644
index e5bd987890781b8b62451f1146452ac61b2d436d..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/995.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "995",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 995,
-    "parentDataId": 376,
-    "skill": 477,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 708
-        },
-        "amount": 250
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 742
-        },
-        "amount": 25
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/996.json b/data/json/SubCompanionUnlockableSkillDefinition/996.json
deleted file mode 100644
index 0a39f23d0363a91436a2f4947d13e296c34d35af..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/996.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "996",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 996,
-    "parentDataId": 90,
-    "skill": 382,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 152
-        },
-        "amount": 60
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 179
-        },
-        "amount": 1
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/997.json b/data/json/SubCompanionUnlockableSkillDefinition/997.json
deleted file mode 100644
index c0c10389c71507a58d7aa62d1e0c345298e64156..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/997.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "997",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 997,
-    "parentDataId": 966,
-    "skill": 677,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 675
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 261
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SubCompanionUnlockableSkillDefinition/998.json b/data/json/SubCompanionUnlockableSkillDefinition/998.json
deleted file mode 100644
index 4207aff7900730b8baae3211b7cc4a78d298eeed..0000000000000000000000000000000000000000
--- a/data/json/SubCompanionUnlockableSkillDefinition/998.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "998",
-  "m_jsonRepresentation": {
-    "type": "SubCompanionUnlockableSkillDefinition",
-    "id": 998,
-    "parentDataId": 339,
-    "skill": 999,
-    "costs": [
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 101
-        },
-        "amount": 350
-      },
-      {
-        "type": "ObtainableItemCost",
-        "item": {
-          "typeEnum": 23,
-          "value": 232
-        },
-        "amount": 35
-      }
-    ]
-  },
-  "m_displayName": "SubCompanionUnlockableSkillDefinition",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/104.json b/data/json/SummoningDefinition/104.json
index d785a6fa5e75ab7d5efc24db88acf4eccd43db6e..358bb720ffd975810cb9c0078838994295473a62 100644
--- a/data/json/SummoningDefinition/104.json
+++ b/data/json/SummoningDefinition/104.json
@@ -25,7 +25,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 62.0,
       "factor": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE COCHON - Ninjadine",
   "m_availability": 3,
   "m_i18nNameId": 2486,
-  "m_i18nDescriptionId": 26081,
+  "m_i18nChampionNameId": 0,
+  "m_i18nDescriptionId": 65477,
   "assetGuid": "461621547321e554c9875729f2466eba"
-}
+}
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/1084.json b/data/json/SummoningDefinition/1084.json
index 56f261aa368d95f859349997429a031ee9897b20..b7cdf47d321dc62753c3095a0f375ae0ae3dbeba 100644
--- a/data/json/SummoningDefinition/1084.json
+++ b/data/json/SummoningDefinition/1084.json
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 35
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Sylvegore le Corrompu",
   "m_availability": 2,
   "m_i18nNameId": 10771,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 64062,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/112.json b/data/json/SummoningDefinition/112.json
index 5328b3b16b7e87eaf9788ea3c0d8a87d197e9986..8ddef473c4899de9dd316b2f882fc79721c5eeff 100644
--- a/data/json/SummoningDefinition/112.json
+++ b/data/json/SummoningDefinition/112.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 08",
   "m_availability": 2,
   "m_i18nNameId": 46620,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 63984,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/114.json b/data/json/SummoningDefinition/114.json
index 7b4d53260dadb4375312b2d1b30785004a3ddcac..a633cd7b4f4e0c467cca21ac1ea17fa7cdcaece1 100644
--- a/data/json/SummoningDefinition/114.json
+++ b/data/json/SummoningDefinition/114.json
@@ -27,7 +27,7 @@
       59
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 55.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -71,6 +79,7 @@
   "m_displayName": "MONSTRE GELEE - Geline Framboise",
   "m_availability": 2,
   "m_i18nNameId": 84465,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 61767,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/117.json b/data/json/SummoningDefinition/117.json
index 02bb839a02d8642aa88f745904fe18429028ce84..b5f44e88ea3acb5235404bc6ccc9c6859270accf 100644
--- a/data/json/SummoningDefinition/117.json
+++ b/data/json/SummoningDefinition/117.json
@@ -15,12 +15,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "at",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         },
         {
@@ -39,7 +39,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 162.0,
       "factor": {
@@ -52,25 +52,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "at",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -78,6 +86,7 @@
   "m_displayName": "MONSTRE BWORK - Chef du Clan",
   "m_availability": 3,
   "m_i18nNameId": 69649,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 18427,
   "assetGuid": "a554b399c52aea540af72c020b06242d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/118.json b/data/json/SummoningDefinition/118.json
index 5b1880052f15d9ea581ad4dec91720b7417ed244..5f7a428fb66423712ce04ab89f44aa26dc07e1f6 100644
--- a/data/json/SummoningDefinition/118.json
+++ b/data/json/SummoningDefinition/118.json
@@ -17,7 +17,6 @@
       "hasEffects": false,
       "keywordReferences": [
         "PADMAAURA",
-        "BATSU",
         "FRACTURED",
         "DIRTY"
       ]
@@ -27,9 +26,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 92.0,
+      "baseValue": 79.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -40,32 +39,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 11.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Carnibal Lecter",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Graton Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 28713,
+  "m_i18nChampionNameId": 68373,
   "m_i18nDescriptionId": 39798,
   "assetGuid": "d684e6af338c0ee42bfb98f66c26a27b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/120.json b/data/json/SummoningDefinition/120.json
index 2a795db27322c5324e473a9f26397dbe3d5e98a4..d0934ef417622ea23b1ab11573540e19ff718488 100644
--- a/data/json/SummoningDefinition/120.json
+++ b/data/json/SummoningDefinition/120.json
@@ -22,6 +22,7 @@
       ],
       "hasEffects": false,
       "keywordReferences": [
+        "PUSH",
         {
           "type": 25,
           "id": 711
@@ -38,7 +39,7 @@
       "baseValue": 66.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -46,25 +47,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -78,6 +87,7 @@
   "m_displayName": "SRAM - Ombre Repoussante",
   "m_availability": 2,
   "m_i18nNameId": 64003,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 22153,
   "assetGuid": "60c5fb8c8c6ad7149a0bccbb6d1fe78e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/121.json b/data/json/SummoningDefinition/121.json
index 6dc0ba66e29a23ab7602d07e0eb06c6effc71268..c4c8469279ab0450245a6c4a540fcb3aa7183f88 100644
--- a/data/json/SummoningDefinition/121.json
+++ b/data/json/SummoningDefinition/121.json
@@ -39,7 +39,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 59.0,
       "factor": {
@@ -52,25 +52,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 750
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -91,6 +99,7 @@
   "m_displayName": "MONSTRE CHAFER - Arbatarba",
   "m_availability": 3,
   "m_i18nNameId": 11745,
+  "m_i18nChampionNameId": 59000,
   "m_i18nDescriptionId": 77780,
   "assetGuid": "758901a5739a2f948a02b8c4642dc998"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/126.json b/data/json/SummoningDefinition/126.json
index d28ffed02d06b982156f44cfdfd9256434b61c93..870f48f447a22bc609993053a88a2640f51d6961 100644
--- a/data/json/SummoningDefinition/126.json
+++ b/data/json/SummoningDefinition/126.json
@@ -14,15 +14,6 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
@@ -32,7 +23,7 @@
       "hasEffects": false,
       "keywordReferences": [
         "PADMAAURA",
-        "COLLISION",
+        "PUSH",
         "DIRTY"
       ]
     },
@@ -41,9 +32,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 79.0,
+      "baseValue": 78.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -54,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 11.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -80,6 +79,7 @@
   "m_displayName": "MONSTRE COCHON - Graton",
   "m_availability": 3,
   "m_i18nNameId": 8827,
+  "m_i18nChampionNameId": 65940,
   "m_i18nDescriptionId": 42232,
   "assetGuid": "e307f42ae464b504aa8cb56d5f376117"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/129.json b/data/json/SummoningDefinition/129.json
index 004ebd71a6ab4917254133e0aaebc50222d7b5a4..c85291ca87250e84ea35f06e5165453655aab918 100644
--- a/data/json/SummoningDefinition/129.json
+++ b/data/json/SummoningDefinition/129.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 8.0,
           "factor": {
@@ -32,7 +32,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 102.0,
       "factor": {
@@ -45,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -84,6 +92,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Archers 3 (Or)",
   "m_availability": 2,
   "m_i18nNameId": 38720,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 6280,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/13.json b/data/json/SummoningDefinition/13.json
index 195e780c049b426b16bb2a439102221930fd3a59..f93c35b35464192feb252f1e63b8ebdb3ced44d9 100644
--- a/data/json/SummoningDefinition/13.json
+++ b/data/json/SummoningDefinition/13.json
@@ -13,12 +13,16 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ppow",
+          "value": 25
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
-        "CRITICAL",
-        "STRIKEATTACK",
         "PORSHIDO"
       ]
     },
@@ -27,9 +31,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 86.0,
+      "baseValue": 77.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -40,45 +44,54 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 16.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
       "min": {
         "type": "ConstIntegerValue",
         "referenceId": "",
-        "value": 3
+        "value": 2
       },
       "max": {
         "type": "ConstIntegerValue",
         "referenceId": "",
-        "value": 5
+        "value": 4
       }
     },
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Yoshigrouitsu",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Soldat Tripoux Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 18723,
+  "m_i18nChampionNameId": 97669,
   "m_i18nDescriptionId": 75489,
   "assetGuid": "0a5cd0c3a94bc7148962a17e5062cef1"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/132.json b/data/json/SummoningDefinition/132.json
index 43b555a8193f93e91e3da56caf5bf7762bc619fa..82f33c548b1758a298e5318a2235f812aa679510 100644
--- a/data/json/SummoningDefinition/132.json
+++ b/data/json/SummoningDefinition/132.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
@@ -38,7 +38,7 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 207.0,
       "factor": {
@@ -51,25 +51,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -83,6 +91,7 @@
   "m_displayName": "MONSTRE BWORK - GARDIEN - Togor Le Détonant",
   "m_availability": 2,
   "m_i18nNameId": 54306,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 94063,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/137.json b/data/json/SummoningDefinition/137.json
index 9051fc1293eb62ffc3501f3419845414c85e647d..db0386d15146f820f8c0b6bdb8bebe61e32b94c2 100644
--- a/data/json/SummoningDefinition/137.json
+++ b/data/json/SummoningDefinition/137.json
@@ -22,6 +22,7 @@
       "keywordReferences": [
         "COLLISION",
         "STUN",
+        "PUSH",
         "CRAQBOWLEUR"
       ]
     },
@@ -29,7 +30,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 98.0,
       "factor": {
@@ -42,18 +43,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
@@ -61,6 +52,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +77,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - Split",
   "m_availability": 2,
   "m_i18nNameId": 75938,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 40778,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/138.json b/data/json/SummoningDefinition/138.json
index 6e3a192ec72a78358c8b33895a398d415b6b6a4c..c25be3de76f7e8f4be27070658baa088b58098cf 100644
--- a/data/json/SummoningDefinition/138.json
+++ b/data/json/SummoningDefinition/138.json
@@ -13,21 +13,11 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "ar",
-          "baseValue": 8.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
-        "STRIKEATTACK",
+        "UNTARGETABLE",
         "PORSHIDO"
       ]
     },
@@ -36,9 +26,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 91.0,
+      "baseValue": 85.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -49,32 +39,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 13.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1000
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Shrouidder",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Disciple Cochonnet Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 11133,
+  "m_i18nChampionNameId": 80769,
   "m_i18nDescriptionId": 28204,
   "assetGuid": "f8d57b6870a744b479e50d5f91faaad3"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/14.json b/data/json/SummoningDefinition/14.json
index c84575382f549f07436be80842ce2885f5d722fe..c4948fee98d4b0db7e7b6b4f570e56f66e945270 100644
--- a/data/json/SummoningDefinition/14.json
+++ b/data/json/SummoningDefinition/14.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "v",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 25
         }
       ],
       "hasEffects": true,
@@ -29,7 +25,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 105.0,
       "factor": {
@@ -42,25 +38,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +72,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Fracasseur",
   "m_availability": 2,
   "m_i18nNameId": 95529,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 4378,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/142.json b/data/json/SummoningDefinition/142.json
index 75664c017f6a4b1547fc4f59edd56f9afb4fc9dc..368c90a66e8ff4e577de42ac51e93d56f98b28d5 100644
--- a/data/json/SummoningDefinition/142.json
+++ b/data/json/SummoningDefinition/142.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 38
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE PICHON - Céphalo punch",
   "m_availability": 2,
   "m_i18nNameId": 91053,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 23634,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/15.json b/data/json/SummoningDefinition/15.json
index 95441bd8ac24fb842a71ce730c6922caa8cb130a..4a65f55dfd6c7714a06219068c3bea8bb27e51a1 100644
--- a/data/json/SummoningDefinition/15.json
+++ b/data/json/SummoningDefinition/15.json
@@ -27,7 +27,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Boufquette",
   "m_availability": 2,
   "m_i18nNameId": 56905,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 81549,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/152.json b/data/json/SummoningDefinition/152.json
index f0926a4e72984ac2029be12fbd9c05dbe75fa36a..d73d6f251954ff75ede2c3aa22f25357ef1902ca 100644
--- a/data/json/SummoningDefinition/152.json
+++ b/data/json/SummoningDefinition/152.json
@@ -17,12 +17,17 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "c1",
-          "value": 1
+          "value": 2
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
           "value": 3
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "a",
+          "value": 3
         }
       ],
       "hasEffects": true,
@@ -35,9 +40,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 80.0,
+      "baseValue": 59.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -48,32 +53,40 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
       "min": {
         "type": "ConstIntegerValue",
         "referenceId": "c1",
-        "value": 1
+        "value": 2
       },
       "max": {
         "type": "ConstIntegerValue",
@@ -84,9 +97,10 @@
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Oscargne",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Arbatarba Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 49198,
+  "m_i18nChampionNameId": 23122,
   "m_i18nDescriptionId": 56363,
   "assetGuid": "8f3c09049d632d7489d9052a21161418"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/153.json b/data/json/SummoningDefinition/153.json
index 52126324ff7a57cd678733b87093693d4d371bef..32306dadd7633dd5c211366884d7711b46c90e39 100644
--- a/data/json/SummoningDefinition/153.json
+++ b/data/json/SummoningDefinition/153.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v",
           "baseValue": 15.0,
           "factor": {
@@ -29,7 +29,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 98.0,
       "factor": {
@@ -42,18 +42,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
@@ -61,6 +51,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - Crac Ancien",
   "m_availability": 2,
   "m_i18nNameId": 74621,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 68488,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/154.json b/data/json/SummoningDefinition/154.json
index edfb55d847b682b98f4e51cc77160fa202c76594..2518f63cc00c9d6bf5e5cdc962a8448e7c6cc1c7 100644
--- a/data/json/SummoningDefinition/154.json
+++ b/data/json/SummoningDefinition/154.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 15
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE RAT - Rat Goût",
   "m_availability": 2,
   "m_i18nNameId": 33493,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 29846,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/155.json b/data/json/SummoningDefinition/155.json
index 19c3749b6cab51120ea21afbb4946dde9481df81..0d721eb80b45973855241e490c06a0469d711b8b 100644
--- a/data/json/SummoningDefinition/155.json
+++ b/data/json/SummoningDefinition/155.json
@@ -14,15 +14,6 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
@@ -32,7 +23,7 @@
       "hasEffects": false,
       "keywordReferences": [
         "PADMAAURA",
-        "COLLISION",
+        "PUSH",
         "DIRTY"
       ]
     },
@@ -41,9 +32,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 94.0,
+      "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -54,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -80,6 +79,7 @@
   "m_displayName": "MONSTRE COCHON - Coppa le Copain",
   "m_availability": 3,
   "m_i18nNameId": 27888,
+  "m_i18nChampionNameId": 98057,
   "m_i18nDescriptionId": 96785,
   "assetGuid": "5097ac3c2c8e4b646b82425ed53dd65e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/159.json b/data/json/SummoningDefinition/159.json
index ca5b6ab2df124f524dd934f2809a78890a2de9ea..930dee594f8e4b643ebd478435d2905b8e3b1001 100644
--- a/data/json/SummoningDefinition/159.json
+++ b/data/json/SummoningDefinition/159.json
@@ -14,15 +14,6 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 16.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
@@ -34,6 +25,7 @@
         "PADMAAURA",
         "STUN",
         "COLLISION",
+        "PUSH",
         "DIRTY"
       ]
     },
@@ -42,9 +34,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 201.0,
+      "baseValue": 221.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -55,25 +47,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -81,6 +81,7 @@
   "m_displayName": "MONSTRE COCHON - Périgourdin",
   "m_availability": 3,
   "m_i18nNameId": 66506,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 5746,
   "assetGuid": "406be6779ab2414418881f76dd2f8f25"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/16.json b/data/json/SummoningDefinition/16.json
index 395a7a0e2e8759d2fac57920d9e84a714229806a..cdc24caba477d72ab0e6be74b895e7a5a2d244be 100644
--- a/data/json/SummoningDefinition/16.json
+++ b/data/json/SummoningDefinition/16.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 12.0,
           "factor": {
@@ -33,7 +33,7 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -46,25 +46,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -72,6 +80,7 @@
   "m_displayName": "MONSTRE COCHON - GARDIEN - Crasseux",
   "m_availability": 2,
   "m_i18nNameId": 13218,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 41023,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/160.json b/data/json/SummoningDefinition/160.json
index 59d4f5144751bca3c5bbb0e158b98d69b50542d6..5e381faf3cf5a8183a57b7f79c5afe866c8afacb 100644
--- a/data/json/SummoningDefinition/160.json
+++ b/data/json/SummoningDefinition/160.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 12.0,
           "factor": {
@@ -24,13 +24,9 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 20
         }
       ],
       "hasEffects": true,
@@ -43,7 +39,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 84.0,
       "factor": {
@@ -56,25 +52,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -82,6 +86,7 @@
   "m_displayName": "MONSTRE BWORK - Bworkakorn",
   "m_availability": 3,
   "m_i18nNameId": 23893,
+  "m_i18nChampionNameId": 35968,
   "m_i18nDescriptionId": 94525,
   "assetGuid": "a6aa67b5fb759474fa69aee2219f13d5"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/161.json b/data/json/SummoningDefinition/161.json
index 58478802bfac8e5c6b5f28beed3a65037e82bddc..3a487447d5efe73b4864baa435aac811e0e160e8 100644
--- a/data/json/SummoningDefinition/161.json
+++ b/data/json/SummoningDefinition/161.json
@@ -13,16 +13,18 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       52,
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 106.0,
+      "baseValue": 102.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -33,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -59,6 +69,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Fantassins Obscurs",
   "m_availability": 2,
   "m_i18nNameId": 56685,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 68890,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/163.json b/data/json/SummoningDefinition/163.json
index 1c528da4fb4a9abdf22bd0ab9f42f61957cfe18b..6a26fdbd39286737861e56f9fe332a1e5bdb6fb7 100644
--- a/data/json/SummoningDefinition/163.json
+++ b/data/json/SummoningDefinition/163.json
@@ -23,7 +23,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +70,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Roi Chuchoteur",
   "m_availability": 2,
   "m_i18nNameId": 76967,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 38219,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/166.json b/data/json/SummoningDefinition/166.json
index b66b3bcca5c29a42b3ff353182e5d3f758fe9c7d..c3bd876ec27086d2e06acd3cd7c14cd56b3b40a2 100644
--- a/data/json/SummoningDefinition/166.json
+++ b/data/json/SummoningDefinition/166.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": -10.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": -25
         }
       ],
       "hasEffects": true,
@@ -29,7 +25,7 @@
       51
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 120.0,
       "factor": {
@@ -42,25 +38,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 40.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +72,7 @@
   "m_displayName": "MONSTRE GELEE - Cubo-Gelée",
   "m_availability": 2,
   "m_i18nNameId": 55387,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 87412,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/167.json b/data/json/SummoningDefinition/167.json
index d08b13b9cf7b62f9d0ee08dc4958ba815cd63559..5f5bdbf0b3d7f7ac66d791e1bd2a084dc6ca5983 100644
--- a/data/json/SummoningDefinition/167.json
+++ b/data/json/SummoningDefinition/167.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.0,
           "factor": {
@@ -33,7 +33,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 174.0,
       "factor": {
@@ -46,25 +46,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -78,6 +86,7 @@
   "m_displayName": "MONSTRE CHAFER - GARDIEN - Érog le Profanateur",
   "m_availability": 2,
   "m_i18nNameId": 30278,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 14284,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/17.json b/data/json/SummoningDefinition/17.json
index 1bcec45ce7409fd65b1a02242c7934c818299f4b..fde11c6bad3f6c8d56be678d94d948536726a78d 100644
--- a/data/json/SummoningDefinition/17.json
+++ b/data/json/SummoningDefinition/17.json
@@ -13,17 +13,19 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "a",
+          "value": 20
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 442
-        },
         "MECHANISM",
         {
           "type": 7,
-          "id": 1964
+          "id": 325
         }
       ]
     },
@@ -31,9 +33,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 27.0,
+      "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -44,32 +46,41 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 15.0,
+      "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Hochos Bochos",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Kasimordo Surin",
+  "m_availability": 3,
   "m_i18nNameId": 44013,
+  "m_i18nChampionNameId": 68627,
   "m_i18nDescriptionId": 78992,
   "assetGuid": "88943b7509525c448b9a07a0a6a38c23"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/172.json b/data/json/SummoningDefinition/172.json
index 3ea8af406839dc45f873291baec0dbb78bb34f1b..3dad24db120fd410e0730aa1443dc45516eaeefe 100644
--- a/data/json/SummoningDefinition/172.json
+++ b/data/json/SummoningDefinition/172.json
@@ -32,7 +32,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 109.0,
       "factor": {
@@ -45,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -71,6 +79,7 @@
   "m_displayName": "MONSTRE COCHON - Instructeur Cochon",
   "m_availability": 3,
   "m_i18nNameId": 48719,
+  "m_i18nChampionNameId": 25654,
   "m_i18nDescriptionId": 14180,
   "assetGuid": "3d88fcea8023f284faae1218520b753a"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/18.json b/data/json/SummoningDefinition/18.json
index 759420340ea56a5f0f56ef61ad7d8c831eb242a9..7bb34bccba448c5c954de024970eb116681e4c94 100644
--- a/data/json/SummoningDefinition/18.json
+++ b/data/json/SummoningDefinition/18.json
@@ -29,22 +29,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 27.0,
       "factor": 2.7
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE TAURE - Mandhal",
   "m_availability": 2,
   "m_i18nNameId": 6301,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 67356,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/182.json b/data/json/SummoningDefinition/182.json
index 2c6595c90cebe5317b8e32dd6de5efb98262a4fb..5b680da48079ba48e1ef28a9f68c97c08c9d3724 100644
--- a/data/json/SummoningDefinition/182.json
+++ b/data/json/SummoningDefinition/182.json
@@ -39,21 +39,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 17
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "OSAMODAS - BETE - Chef Flaqueux",
   "m_availability": 3,
   "m_i18nNameId": 61543,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 33076,
   "assetGuid": "a448ec76125c8cc43ba6ca7b401e2649"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/183.json b/data/json/SummoningDefinition/183.json
index e4153ed9f8a88b39023a6407c60c6f592159b82a..8d1f0cfdc61f6c26123386245ccd27f94c42bc53 100644
--- a/data/json/SummoningDefinition/183.json
+++ b/data/json/SummoningDefinition/183.json
@@ -21,7 +21,7 @@
       51
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 96.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "customActionTarget": {
       "type": "FilteredCharacterSelector",
       "filters": [
@@ -72,6 +80,7 @@
   "m_displayName": "MONSTRE GELEE - Geline Arc-En-Ciel",
   "m_availability": 2,
   "m_i18nNameId": 20912,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 62900,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/184.json b/data/json/SummoningDefinition/184.json
index f51d07fcbf514b4debc5e154297a30b1d548ad61..ca42d979c7a46e59e0db133da527efe076eef581 100644
--- a/data/json/SummoningDefinition/184.json
+++ b/data/json/SummoningDefinition/184.json
@@ -14,10 +14,9 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
         "BUSHIAURA",
-        "DOUBLE",
         "PORSHIDO"
       ]
     },
@@ -26,9 +25,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 93.0,
+      "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -39,32 +38,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 13.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Mai Shiragrouik",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Coppa le Copain Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 44089,
+  "m_i18nChampionNameId": 90043,
   "m_i18nDescriptionId": 64090,
   "assetGuid": "461621547321e554c9875729f2466eba"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/186.json b/data/json/SummoningDefinition/186.json
index e8cda2e58c5fe0d09a79f752e62f186769fc1a3b..e9fec050a25d5260613f6c06edb6cb4754c8a1cc 100644
--- a/data/json/SummoningDefinition/186.json
+++ b/data/json/SummoningDefinition/186.json
@@ -35,21 +35,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -57,6 +65,7 @@
   "m_displayName": "OSAMODAS - BETE - Chef Prespic",
   "m_availability": 3,
   "m_i18nNameId": 94495,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 8979,
   "assetGuid": "b442e177e7716fa4bb14831a295b92c9"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/189.json b/data/json/SummoningDefinition/189.json
index 4f4034f363a8a6a3a8c5ccab2b11b9c1b1d699f5..b38c99d20763b17a42215bb7156469ee3ff328b8 100644
--- a/data/json/SummoningDefinition/189.json
+++ b/data/json/SummoningDefinition/189.json
@@ -23,7 +23,7 @@
       60
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 80.0,
       "factor": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +70,7 @@
   "m_displayName": "MONSTRE GELEE - Gelée Framboise",
   "m_availability": 2,
   "m_i18nNameId": 50828,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 3135,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/190.json b/data/json/SummoningDefinition/190.json
index 0ac491f9fc6b36c92d7d79d58104cddf80b7854f..6c60c499535900155bdb011efe0d85223078335e 100644
--- a/data/json/SummoningDefinition/190.json
+++ b/data/json/SummoningDefinition/190.json
@@ -34,7 +34,7 @@
       "baseValue": 112.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -42,25 +42,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 28.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "SACRIEUR - LEGENDAIRE - Martyricone",
   "m_availability": 3,
   "m_i18nNameId": 21459,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 85918,
   "assetGuid": "889cecf4838e3da4b83d6e5fce00c78e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/191.json b/data/json/SummoningDefinition/191.json
index a6d41a6955c124e48de3408588b31a28f12b3953..21bb8b5a1a9361ea392106cfd8c6b0db5472d08d 100644
--- a/data/json/SummoningDefinition/191.json
+++ b/data/json/SummoningDefinition/191.json
@@ -26,9 +26,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 76.0,
+      "baseValue": 68.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -39,25 +39,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -65,6 +81,7 @@
   "m_displayName": "MONSTRE CHAFER - Proctoss",
   "m_availability": 3,
   "m_i18nNameId": 30683,
+  "m_i18nChampionNameId": 28322,
   "m_i18nDescriptionId": 50172,
   "assetGuid": "2c4efcd3640e1c141b97682effe4098d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/193.json b/data/json/SummoningDefinition/193.json
index b9ca5694d0ca57ed244f42d4fecfc4aebce5c18b..0669bb6df431b66ddcdbb26e6c01a289b3e043c8 100644
--- a/data/json/SummoningDefinition/193.json
+++ b/data/json/SummoningDefinition/193.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 45
         }
       ],
       "hasEffects": true,
@@ -31,7 +27,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 102.0,
       "factor": {
@@ -44,25 +40,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -83,6 +87,7 @@
   "m_displayName": "MONSTRE CHAFER - Crogneur",
   "m_availability": 3,
   "m_i18nNameId": 65866,
+  "m_i18nChampionNameId": 69661,
   "m_i18nDescriptionId": 56404,
   "assetGuid": "f475d9070cb33834fa6bde073a1a2a37"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/1958.json b/data/json/SummoningDefinition/1958.json
index 9c5e1e12539b73c148c07d8b125fed2c58e8dc8a..aed568da00dbf6a125ad98179c1d5a0e360639cd 100644
--- a/data/json/SummoningDefinition/1958.json
+++ b/data/json/SummoningDefinition/1958.json
@@ -13,8 +13,14 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": true,
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "dmg",
+          "value": 25
+        }
+      ],
+      "hasEffects": false,
       "keywordReferences": [
         "PADMAAURA",
         "DIRTY"
@@ -25,9 +31,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 111.0,
+      "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -38,32 +44,41 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 11.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Gralex Lelarge",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Coppa le Copain Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 80564,
+  "m_i18nChampionNameId": 67835,
   "m_i18nDescriptionId": 88606,
   "assetGuid": "6ff80648c2080914e984705d6d0b1eb4"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/196.json b/data/json/SummoningDefinition/196.json
index 8523a9b341255b5ef4038714a5f3c1b849de1109..fffe88e697304377d19241ae95f6318945c15e07 100644
--- a/data/json/SummoningDefinition/196.json
+++ b/data/json/SummoningDefinition/196.json
@@ -28,7 +28,7 @@
       "baseValue": 100.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 20.0,
+      "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +86,7 @@
   "m_displayName": "RING - Kanard",
   "m_availability": 3,
   "m_i18nNameId": 36069,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 77167,
   "assetGuid": "1c12ed2a3a567cf46ac6ac457a5895a7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/198.json b/data/json/SummoningDefinition/198.json
index c4e29cf8fb88e5e279bc8633c9895599455efde5..9b21ecd1adfd259528fd53e77bb252c9769272cc 100644
--- a/data/json/SummoningDefinition/198.json
+++ b/data/json/SummoningDefinition/198.json
@@ -26,13 +26,15 @@
         }
       ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 71.0,
       "factor": {
@@ -45,25 +47,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 18.0,
+      "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -71,6 +81,7 @@
   "m_displayName": "MONSTRE CHAFER - Picoss",
   "m_availability": 3,
   "m_i18nNameId": 65166,
+  "m_i18nChampionNameId": 46601,
   "m_i18nDescriptionId": 37685,
   "assetGuid": "221c032108076f341ac3c38bd5d8f75e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/204.json b/data/json/SummoningDefinition/204.json
index 90426067432966673a0da6a5747e19ce087c5878..94004c62ec55f1826e6d5324aacebaf0dda32d57 100644
--- a/data/json/SummoningDefinition/204.json
+++ b/data/json/SummoningDefinition/204.json
@@ -14,13 +14,10 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
-        "EVOLVE",
-        {
-          "type": 25,
-          "id": 38
-        }
+        "WAVE",
+        "UNIQUE"
       ]
     },
     "families": [
@@ -32,7 +29,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -40,21 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 0
+      "baseValue": 10.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 9
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +87,7 @@
   "m_displayName": "IOP - Âme Vide",
   "m_availability": 3,
   "m_i18nNameId": 66085,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 75274,
   "assetGuid": "333d0dd36e5c3ee46bc9b351039f650d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/207.json b/data/json/SummoningDefinition/207.json
index a4a1886ee863db230b8c63163d8ceb8c50112565..8393fcc52b764db6e1d47ea8fe4edd616cbf9b16 100644
--- a/data/json/SummoningDefinition/207.json
+++ b/data/json/SummoningDefinition/207.json
@@ -25,7 +25,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 104.0,
       "factor": {
@@ -38,18 +38,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 24.0,
       "factor": {
@@ -57,6 +47,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE TAURE - Grabataure",
   "m_availability": 2,
   "m_i18nNameId": 21778,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 80195,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/2096.json b/data/json/SummoningDefinition/2096.json
index c7d8f93753d44929d6ed7f4491cfcd22fc08ffd3..8e094c28292b8e311e246bae16bd7066c72457e9 100644
--- a/data/json/SummoningDefinition/2096.json
+++ b/data/json/SummoningDefinition/2096.json
@@ -29,7 +29,7 @@
       0
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 122.0,
       "factor": {
@@ -42,25 +42,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "PNJ - COCHON - Niels Laren",
   "m_availability": 3,
   "m_i18nNameId": 80943,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 88943,
   "assetGuid": "d2e24988b56dccd4eb6e8f0c24750f8b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/2114.json b/data/json/SummoningDefinition/2114.json
index 0cd64524ac3707fb2d787073e9c525748322fb79..bcd7a0415723c1cd2fcdd0b82d9186d58951c156 100644
--- a/data/json/SummoningDefinition/2114.json
+++ b/data/json/SummoningDefinition/2114.json
@@ -23,7 +23,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 97.0,
       "factor": {
@@ -36,16 +36,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "customActionTarget": {
       "type": "FilteredCharacterSelector",
       "filters": []
@@ -57,6 +65,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Conjurateurs (Boss Fight)",
   "m_availability": 2,
   "m_i18nNameId": 44403,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 45981,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/213.json b/data/json/SummoningDefinition/213.json
index 7f825aca6909044f42da44d7809253aa755baa9d..a858edddf07a81efb3b49e2e4d4c2287a8ea6db4 100644
--- a/data/json/SummoningDefinition/213.json
+++ b/data/json/SummoningDefinition/213.json
@@ -13,28 +13,10 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        "UNTARGETABLE",
-        "STUN",
-        "FLOOR",
         "BUSHIAURA",
-        "CRITICAL",
-        {
-          "type": 6,
-          "id": 1867
-        },
         "PORSHIDO"
       ]
     },
@@ -43,9 +25,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 92.0,
+      "baseValue": 79.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -56,32 +38,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 13.0,
+      "baseValue": 11.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Grouik Smoke",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Graton Ninja ",
+  "m_availability": 3,
   "m_i18nNameId": 23639,
+  "m_i18nChampionNameId": 11125,
   "m_i18nDescriptionId": 22686,
   "assetGuid": "04e9368fd5ab2ea4797078cc5a828b6e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/215.json b/data/json/SummoningDefinition/215.json
index 3de875b9307baff6a95b4d3201a087ed8486f52c..dfdcbde40f562495692cd57341292edde18c2c47 100644
--- a/data/json/SummoningDefinition/215.json
+++ b/data/json/SummoningDefinition/215.json
@@ -37,22 +37,30 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.9,
       "factor": 2.1
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Dragon Vert",
   "m_availability": 2,
   "m_i18nNameId": 93470,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 66390,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/217.json b/data/json/SummoningDefinition/217.json
index 8465560d4922e234e10f58632789150eb6670e80..21383262c9d74a9e4c346331b8f8713c996cca7e 100644
--- a/data/json/SummoningDefinition/217.json
+++ b/data/json/SummoningDefinition/217.json
@@ -37,21 +37,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -59,6 +67,7 @@
   "m_displayName": "OSAMODAS - BETE - Bébé Flaqueux",
   "m_availability": 3,
   "m_i18nNameId": 81712,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 31341,
   "assetGuid": "009d447818034954290636fabcfd40ec"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/2172.json b/data/json/SummoningDefinition/2172.json
index 58788b54a4456b68ba4460d7801e97963fb1416f..a53a964f670036ddf9f42610319783ee5693b6ed 100644
--- a/data/json/SummoningDefinition/2172.json
+++ b/data/json/SummoningDefinition/2172.json
@@ -22,7 +22,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -35,18 +35,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
@@ -54,6 +44,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - Brooklin",
   "m_availability": 2,
   "m_i18nNameId": 23293,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 51248,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/219.json b/data/json/SummoningDefinition/219.json
index 6460cbcdd807d2c3105c990988f97ef75607a122..fc0ddbdddf2ac0dd5fb90ba4699c7ad27098bc71 100644
--- a/data/json/SummoningDefinition/219.json
+++ b/data/json/SummoningDefinition/219.json
@@ -15,22 +15,14 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "atk",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 20
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 25
         }
       ],
       "hasEffects": true,
@@ -49,7 +41,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 218.0,
       "factor": {
@@ -62,25 +54,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 75
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 750
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -88,6 +88,7 @@
   "m_displayName": "MONSTRE COCHON - Empereur Guemene",
   "m_availability": 3,
   "m_i18nNameId": 96572,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 73013,
   "assetGuid": "48ca3d1474b19a140badc2419510ed09"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/224.json b/data/json/SummoningDefinition/224.json
index fe6f67851bf55bc42af935d09d7113a6a7c32ae9..056fbc31a2c688cc9298a7d8ff1c53702319c626 100644
--- a/data/json/SummoningDefinition/224.json
+++ b/data/json/SummoningDefinition/224.json
@@ -27,7 +27,7 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 101.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE BWORK - Le Bworkdog avec sa monture",
   "m_availability": 3,
   "m_i18nNameId": 82796,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 62316,
   "assetGuid": "8184d4fa61b6d494e8e8a22ba3540e40"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/227.json b/data/json/SummoningDefinition/227.json
index a13444ade1f796c19806d48f77e0cfd846a638da..280d1bdaf5888abdfc4ad0dfea83ba740bcd5d02 100644
--- a/data/json/SummoningDefinition/227.json
+++ b/data/json/SummoningDefinition/227.json
@@ -26,7 +26,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 175.0,
       "factor": {
@@ -39,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 2,
     "actionRange": {
       "type": "ActionRange",
@@ -84,6 +92,7 @@
   "m_displayName": "MONSTRE CHAFER - GARDIEN - Liche Azundor",
   "m_availability": 2,
   "m_i18nNameId": 92185,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 35131,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/23.json b/data/json/SummoningDefinition/23.json
index 473b999dae4ca0dd545fb08c15cc9c0ed6a4d14f..11cecfb1bbe6c7578f71717bcc5718530386f2f2 100644
--- a/data/json/SummoningDefinition/23.json
+++ b/data/json/SummoningDefinition/23.json
@@ -35,7 +35,7 @@
       51
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 97.0,
       "factor": {
@@ -48,25 +48,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -74,6 +82,7 @@
   "m_displayName": "MONSTRE GELEE - Croco Mou",
   "m_availability": 2,
   "m_i18nNameId": 71250,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 36875,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/234.json b/data/json/SummoningDefinition/234.json
index 1c169455291616495ddfe34e481752a951cb9032..4368546e39ed9f0e79cedcc524cac4f4c7a14978 100644
--- a/data/json/SummoningDefinition/234.json
+++ b/data/json/SummoningDefinition/234.json
@@ -20,6 +20,7 @@
       ],
       "hasEffects": false,
       "keywordReferences": [
+        "PUSH",
         "MUSTNOTDIE"
       ]
     },
@@ -36,21 +37,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 1
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +67,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Bouftonciel",
   "m_availability": 2,
   "m_i18nNameId": 16006,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 39326,
   "assetGuid": "cf49402491c3e994e8ef2eb3bf21fe5c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/236.json b/data/json/SummoningDefinition/236.json
index 3ca20136801c28b5ac36d43f3d5c378e8d9645f4..9c4e78e6f45795d23d8319dd3e5108b38bb0d56c 100644
--- a/data/json/SummoningDefinition/236.json
+++ b/data/json/SummoningDefinition/236.json
@@ -14,10 +14,10 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
         "LIGHTNING",
-        "PHASE"
+        "UNIQUE"
       ]
     },
     "families": [
@@ -29,7 +29,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -37,23 +37,57 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
+    "actionValue": {
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 0
+      "baseValue": 15.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 9
+      }
     },
-    "actionType": 0,
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
+    "actionType": 1,
     "spells": [],
     "cost": []
   },
   "m_displayName": "IOP - Âme Céleste",
   "m_availability": 3,
   "m_i18nNameId": 79048,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 10915,
   "assetGuid": "fd90a9a016e8c604cb96db4bf58570a9"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/238.json b/data/json/SummoningDefinition/238.json
index 002f98394c969d5cf943e0e51d72de45422b7459..ed025eb22010887aa5df967db180107b60fd49e0 100644
--- a/data/json/SummoningDefinition/238.json
+++ b/data/json/SummoningDefinition/238.json
@@ -30,7 +30,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 34.0,
       "factor": {
@@ -43,25 +43,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +77,7 @@
   "m_displayName": "MONSTRE CHAFER - Avorton Chafer",
   "m_availability": 3,
   "m_i18nNameId": 20569,
+  "m_i18nChampionNameId": 55732,
   "m_i18nDescriptionId": 92706,
   "assetGuid": "6dfa6d307f3ed734ea9b35526723e9db"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/239.json b/data/json/SummoningDefinition/239.json
index 730e0603e4db7e91dce7a971829885703a44cd1e..e54673a6fd1aab6e1a6bd5509f9feb364ea3184b 100644
--- a/data/json/SummoningDefinition/239.json
+++ b/data/json/SummoningDefinition/239.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 11",
   "m_availability": 2,
   "m_i18nNameId": 69031,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 26557,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/247.json b/data/json/SummoningDefinition/247.json
index 26877aedbadc6baf4297af38c818ace0fec289c1..f6fc1d2ef6f8120c769b5588fe08455b1afd669f 100644
--- a/data/json/SummoningDefinition/247.json
+++ b/data/json/SummoningDefinition/247.json
@@ -31,16 +31,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -48,6 +56,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Oeuf Rouge",
   "m_availability": 2,
   "m_i18nNameId": 46449,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 59945,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/248.json b/data/json/SummoningDefinition/248.json
index d0fe6dc6f5b92afc5e41244985d8c52496d2b24a..2f493a811a80196cf100a03a08cef5e41689e10d 100644
--- a/data/json/SummoningDefinition/248.json
+++ b/data/json/SummoningDefinition/248.json
@@ -7,46 +7,36 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 8406,
     "skins": [
-      1
+      8406
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmg",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "ex",
-          "baseValue": 11.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 2
         }
       ],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
-        "EXPLOSION",
-        "ANGRYDRIVE"
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        "ROOTED"
       ]
     },
     "families": [
-      49,
-      63
+      49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 98.0,
+      "baseValue": 111.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -55,34 +45,43 @@
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 3
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
+      "value": 2
     },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 21.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Bwork Crache Feu",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Gro Bwork Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 46147,
+  "m_i18nChampionNameId": 2807,
   "m_i18nDescriptionId": 49178,
-  "assetGuid": ""
+  "assetGuid": "9523e115b6f7832408a0bab5a9ce7e3a"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/249.json b/data/json/SummoningDefinition/249.json
index 5326a6ec2d3a8700d157a41e3af59ec7d33ea498..49dd80335a3a9f9e34f6181169bcbc0ad7c670aa 100644
--- a/data/json/SummoningDefinition/249.json
+++ b/data/json/SummoningDefinition/249.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
@@ -29,30 +25,46 @@
       51
     ],
     "life": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 250
+      "baseValue": 250.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 0
+      }
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 25
+      "baseValue": 25.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 1
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +72,7 @@
   "m_displayName": "MONSTRE GELEE - Lieutenant Carie",
   "m_availability": 2,
   "m_i18nNameId": 39812,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 83012,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/250.json b/data/json/SummoningDefinition/250.json
index f98df263476623dd06e9eafca63c4ef75b7e53c1..b26f7b4a83237a259c8e904bb0e2c57d637b5eec 100644
--- a/data/json/SummoningDefinition/250.json
+++ b/data/json/SummoningDefinition/250.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 09",
   "m_availability": 2,
   "m_i18nNameId": 60938,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 58426,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/251.json b/data/json/SummoningDefinition/251.json
index e17354a8dd25ec2d7ddc761c705e0c73271db931..c7fba7077ab555d68ed6d83a5e62b9bc79777ada 100644
--- a/data/json/SummoningDefinition/251.json
+++ b/data/json/SummoningDefinition/251.json
@@ -37,7 +37,7 @@
       "baseValue": 58.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -45,25 +45,49 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -71,6 +95,7 @@
   "m_displayName": "COMPAGNON - DATHURA - Poupée de Dathura",
   "m_availability": 3,
   "m_i18nNameId": 27477,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 54567,
   "assetGuid": "31310ed2e3ac9ab4bb75af9ae6a8be88"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/257.json b/data/json/SummoningDefinition/257.json
index a884aaa05b2ab7c99df064001edf50e16b8953b7..80a9630b9a95a6ad97dcba12ecf5dd8299dc4887 100644
--- a/data/json/SummoningDefinition/257.json
+++ b/data/json/SummoningDefinition/257.json
@@ -28,7 +28,7 @@
       "baseValue": 63.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +70,7 @@
   "m_displayName": "SACRIEUR - Lame du Tatoué",
   "m_availability": 3,
   "m_i18nNameId": 17708,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 64719,
   "assetGuid": "f0b0a7dca557fe44cb564207e9501d01"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/264.json b/data/json/SummoningDefinition/264.json
index cf6124b614b7b227daeb2e6d32854a63f42fedff..3ab3ad05039fb9552beaceddffa1e0a3e77e5ac5 100644
--- a/data/json/SummoningDefinition/264.json
+++ b/data/json/SummoningDefinition/264.json
@@ -19,7 +19,7 @@
       51
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -32,25 +32,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE GELEE - Totem Gelbibi",
   "m_availability": 2,
   "m_i18nNameId": 31004,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 721,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/266.json b/data/json/SummoningDefinition/266.json
index e44e43129ef585c638389c6c53d962001977544c..cd755e8c4265279d657aebf9b0262b1b415d21dc 100644
--- a/data/json/SummoningDefinition/266.json
+++ b/data/json/SummoningDefinition/266.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 02",
   "m_availability": 2,
   "m_i18nNameId": 20252,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 79914,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/27.json b/data/json/SummoningDefinition/27.json
index e587f7167dda3edf1bae965f87c777e2da0a5043..86500e018cd3a8f1b1912f21301ade66e9335eab 100644
--- a/data/json/SummoningDefinition/27.json
+++ b/data/json/SummoningDefinition/27.json
@@ -16,25 +16,24 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 442
-        },
         "MECHANISM",
         {
           "type": 7,
-          "id": 1964
+          "id": 409
         },
-        "FROZEN"
+        {
+          "type": 7,
+          "id": 1942
+        }
       ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 28.0,
+      "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -45,32 +44,41 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 25.0,
+      "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Aligore le Fragile",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Kasimordo Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 93886,
+  "m_i18nChampionNameId": 51264,
   "m_i18nDescriptionId": 71422,
   "assetGuid": "0f743957538356044bf282cd7565688d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/2742.json b/data/json/SummoningDefinition/2742.json
index 299476c3fd08a9da6f78001af38bf9738daec627..d660c78366492653a19dc52fc1abaabae9f6bc33 100644
--- a/data/json/SummoningDefinition/2742.json
+++ b/data/json/SummoningDefinition/2742.json
@@ -26,7 +26,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 95.0,
       "factor": {
@@ -39,18 +39,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
@@ -58,6 +48,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -65,6 +73,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - croquis",
   "m_availability": 2,
   "m_i18nNameId": 95135,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 9511,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/278.json b/data/json/SummoningDefinition/278.json
index 17b8bd92de929522463eb700ff87a9c7f15cf3a6..97ee7537dce686fad488270a1b90adfa2d25330a 100644
--- a/data/json/SummoningDefinition/278.json
+++ b/data/json/SummoningDefinition/278.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v",
           "baseValue": 10.0,
           "factor": {
@@ -35,7 +35,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -48,18 +48,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
@@ -67,6 +57,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -74,6 +82,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - Craquemousse",
   "m_availability": 2,
   "m_i18nNameId": 99264,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 76046,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/2785.json b/data/json/SummoningDefinition/2785.json
index 1587a073e8e8685da4f0064896efb97e29a59fbe..7ff8b108a6462a8f69b782f1507217a3671080a3 100644
--- a/data/json/SummoningDefinition/2785.json
+++ b/data/json/SummoningDefinition/2785.json
@@ -21,7 +21,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 85.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "customActionTarget": {
       "type": "FilteredEntitySelector",
       "from": {
@@ -91,6 +99,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Raie Noire",
   "m_availability": 2,
   "m_i18nNameId": 24620,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 37601,
   "assetGuid": "0c834e7fc437ecf47b71891a5bfff71b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/281.json b/data/json/SummoningDefinition/281.json
index 6f2b73edcbe5e3c32df90e67fc8a5673966870e1..af188d6f3dfd4e3c193ba3c820976be658a106a9 100644
--- a/data/json/SummoningDefinition/281.json
+++ b/data/json/SummoningDefinition/281.json
@@ -21,7 +21,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 87.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Tofu Tonic",
   "m_availability": 2,
   "m_i18nNameId": 33742,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 99938,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/284.json b/data/json/SummoningDefinition/284.json
index 30fe802ce667ed037572d465388d5a6bc5444f54..0f3517a102e774499fc671ebdbb0fa68620789c3 100644
--- a/data/json/SummoningDefinition/284.json
+++ b/data/json/SummoningDefinition/284.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Champion Prespic",
   "m_availability": 3,
   "m_i18nNameId": 56322,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 81395,
   "assetGuid": "42e00444c4ef1de4c9b28590b738e151"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/285.json b/data/json/SummoningDefinition/285.json
index 84f8afa90a94f38d29c1066b20efb27175fe1a8e..101ce69dc0fcf367c5049a94bab112e91582e148 100644
--- a/data/json/SummoningDefinition/285.json
+++ b/data/json/SummoningDefinition/285.json
@@ -1,80 +1,83 @@
 {
   "m_FileID": 0,
-  "m_Name": "286",
+  "m_Name": "797",
   "m_jsonRepresentation": {
     "type": "SummoningDefinition",
-    "id": 286,
+    "id": 797,
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2742,
-    "skins": [
-      2742
-    ],
+    "defaultSkin": 681,
+    "skins": [],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmg",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        "BUSHIAURA",
-        "STRIKEATTACK",
-        "PORSHIDO"
+        {
+          "type": 25,
+          "id": 20122
+        },
+        "UNMOVABLE"
       ]
     },
     "families": [
-      50,
-      64
+      48
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 80.0,
-      "factor": {
-        "type": "ReferenceScalingFactor",
-        "reference": 0
-      }
+      "baseValue": 202.5,
+      "factor": 22.5
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 3
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
+      "value": 0
     },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
-      "factor": {
-        "type": "ReferenceScalingFactor",
-        "reference": 0
-      }
+      "baseValue": 8.1,
+      "factor": 0.9
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
-    "spells": [],
+    "spells": [
+      {
+        "type": "SpellOnSpawnWithDestination",
+        "spell": 399,
+        "destination": 4
+      },
+      {
+        "type": "SpellOnSpawnWithDestination",
+        "spell": 399,
+        "destination": 4
+      }
+    ],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Grouyu Hayabusa",
+  "m_displayName": "MONSTRE ABRAKNYDE - Araknode l\u0027Indésirable",
   "m_availability": 2,
-  "m_i18nNameId": 78878,
-  "m_i18nDescriptionId": 4839,
-  "assetGuid": "461621547321e554c9875729f2466eba"
-}
\ No newline at end of file
+  "m_i18nNameId": 26739,
+  "m_i18nChampionNameId": 0,
+  "m_i18nDescriptionId": 58808,
+  "assetGuid": ""
+} 
diff --git a/data/json/SummoningDefinition/286.json b/data/json/SummoningDefinition/286.json
index 84f8afa90a94f38d29c1066b20efb27175fe1a8e..246cc94b584396bec8e42a706d01d6d47a3beeba 100644
--- a/data/json/SummoningDefinition/286.json
+++ b/data/json/SummoningDefinition/286.json
@@ -15,19 +15,14 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmg",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "a",
+          "value": 1
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
-        "STRIKEATTACK",
         "PORSHIDO"
       ]
     },
@@ -36,9 +31,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 80.0,
+      "baseValue": 109.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -49,32 +44,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
+      "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Grouyu Hayabusa",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Instructeur Cochon Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 78878,
+  "m_i18nChampionNameId": 14173,
   "m_i18nDescriptionId": 4839,
-  "assetGuid": "461621547321e554c9875729f2466eba"
+  "assetGuid": "bb67e472a4991204eb27de19f6d0d99e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/288.json b/data/json/SummoningDefinition/288.json
index 7c76fd2e452fca3acc91007cd5908a4eb37f257f..f78c4c548c07a0372937f97caa98ccc602338601 100644
--- a/data/json/SummoningDefinition/288.json
+++ b/data/json/SummoningDefinition/288.json
@@ -37,21 +37,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -59,6 +67,7 @@
   "m_displayName": "OSAMODAS - BETE - Champion Bouftou",
   "m_availability": 3,
   "m_i18nNameId": 55753,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 82273,
   "assetGuid": "0b4fa4d47d9a60d49a3257c91d9bc6c4"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/29.json b/data/json/SummoningDefinition/29.json
index 2eb272e1efcd79862eeb27b1dae08f79c4aaf046..d5d8b03505689d21179071311f292a8afb60f2f0 100644
--- a/data/json/SummoningDefinition/29.json
+++ b/data/json/SummoningDefinition/29.json
@@ -28,7 +28,7 @@
       "baseValue": 120.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -36,25 +36,49 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +86,7 @@
   "m_displayName": "GEMME - Oeil Nécromique",
   "m_availability": 3,
   "m_i18nNameId": 66432,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 38770,
   "assetGuid": "5050d452677b20e41b1fdeba2e4c48c8"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/293.json b/data/json/SummoningDefinition/293.json
index bdee7944228ebb7336f5c3f9254a00db71507856..67125b74b6446589579c27108952cc2f2f0857c8 100644
--- a/data/json/SummoningDefinition/293.json
+++ b/data/json/SummoningDefinition/293.json
@@ -15,7 +15,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "AT",
-          "value": 5
+          "value": 35
         }
       ],
       "hasEffects": true,
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 15
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "MONSTRE RAT - Rat Gnarok",
   "m_availability": 2,
   "m_i18nNameId": 50327,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 52537,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/294.json b/data/json/SummoningDefinition/294.json
index 178ca5e0ef9b4fa12d3f3119824cd123a001f034..c613221f2c0485927a1df1aafe8932a8dba093cb 100644
--- a/data/json/SummoningDefinition/294.json
+++ b/data/json/SummoningDefinition/294.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 15.0,
           "factor": {
@@ -47,7 +47,7 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 185.0,
       "factor": {
@@ -60,25 +60,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -92,6 +100,7 @@
   "m_displayName": "MONSTRE BWORK - GARDIEN - Narod Le Pataugeur",
   "m_availability": 2,
   "m_i18nNameId": 24077,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 96294,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/299.json b/data/json/SummoningDefinition/299.json
index bfb3fc2e82b1436e1e9b74197913f30e6d5e345a..5c5e06d90457d26e38d781ef4b9a0f79ff039ca2 100644
--- a/data/json/SummoningDefinition/299.json
+++ b/data/json/SummoningDefinition/299.json
@@ -13,12 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -29,30 +29,46 @@
       51
     ],
     "life": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 250
+      "baseValue": 250.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 0
+      }
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 20
+      "baseValue": 20.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 1
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +76,7 @@
   "m_displayName": "MONSTRE GELEE - Sor-Sucrerie",
   "m_availability": 2,
   "m_i18nNameId": 86719,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 88059,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/30.json b/data/json/SummoningDefinition/30.json
index 72085074afd446eadc9813c1a78f24cc9729b377..0e19441ed82e9ff0e7b95e9d0af5d0a90496eced 100644
--- a/data/json/SummoningDefinition/30.json
+++ b/data/json/SummoningDefinition/30.json
@@ -7,23 +7,36 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2862,
+    "defaultSkin": 9999,
     "skins": [
-      2862
+      9999
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 25
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 2
+        }
+      ],
+      "hasEffects": true,
+      "keywordReferences": [
+        "EXALTED"
+      ]
     },
     "families": [
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 108.0,
+      "baseValue": 111.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,32 +47,41 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 24.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Capitaine Jako",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Gro Bwork Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 53040,
+  "m_i18nChampionNameId": 26481,
   "m_i18nDescriptionId": 21728,
-  "assetGuid": ""
+  "assetGuid": "64b195e2bce8c914d8a9a96b54fdf21c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/302.json b/data/json/SummoningDefinition/302.json
index b1ebba7316f6876cad3948e29e1fd6f1c7338024..84fca751f49aaeed7ae1124837959c9d959dd831 100644
--- a/data/json/SummoningDefinition/302.json
+++ b/data/json/SummoningDefinition/302.json
@@ -13,19 +13,31 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "min",
+          "value": 1
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "max",
+          "value": 2
+        }
+      ],
       "hasEffects": false,
       "keywordReferences": [
-        "NECROSED"
+        "ROOTED",
+        "PUSH"
       ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 82.0,
+      "baseValue": 71.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -36,32 +48,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 16.0,
+      "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - L\u0027Évideur",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Picoss Surin",
+  "m_availability": 3,
   "m_i18nNameId": 67787,
+  "m_i18nChampionNameId": 95062,
   "m_i18nDescriptionId": 17453,
   "assetGuid": "02f367df11f4cb249b8bf70a1bd786f9"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/31.json b/data/json/SummoningDefinition/31.json
index c24b7a3cb6e1bbc9221b877152f6dddb477ab0ab..9754d65800b1edba4a0f1ae4c6085eae8a76e626 100644
--- a/data/json/SummoningDefinition/31.json
+++ b/data/json/SummoningDefinition/31.json
@@ -7,25 +7,32 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2795,
+    "defaultSkin": 4967,
     "skins": [
-      2795
+      4967
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "x",
+          "value": 50
+        }
+      ],
+      "hasEffects": true,
       "keywordReferences": [
-        "BATTERED"
+        "ANGRYDRIVE"
       ]
     },
     "families": [
-      49
+      49,
+      63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 97.0,
+      "baseValue": 90.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,27 +41,35 @@
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 2
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
+      "value": 3
     },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 18.0,
+      "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -66,15 +81,16 @@
       "max": {
         "type": "ConstIntegerValue",
         "referenceId": "",
-        "value": 5
+        "value": 4
       }
     },
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Bill l\u0027Arquebusier",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Traqueur Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 69807,
+  "m_i18nChampionNameId": 30229,
   "m_i18nDescriptionId": 71098,
-  "assetGuid": ""
+  "assetGuid": "566bed76e4963964baf4cf4b55d442d1"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/311.json b/data/json/SummoningDefinition/311.json
index 2e4c5247588a12814ca5eb19409b13a7aea937f4..3f3b06d7a9031bf953811019a57760db841a69dc 100644
--- a/data/json/SummoningDefinition/311.json
+++ b/data/json/SummoningDefinition/311.json
@@ -38,7 +38,7 @@
       "baseValue": 79.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -46,25 +46,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -72,6 +80,7 @@
   "m_displayName": "SRAM - LEGENDAIRE - Le Grand Mornifleur",
   "m_availability": 2,
   "m_i18nNameId": 17939,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 90089,
   "assetGuid": "e51542f080b70b644b76ee712aa06801"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/313.json b/data/json/SummoningDefinition/313.json
index c1f0e4df9ede0d1b2fd104bb4abffde033d4c699..7126ff9b3b8809c2cea6d5b1ac07a39f4cadfe9b 100644
--- a/data/json/SummoningDefinition/313.json
+++ b/data/json/SummoningDefinition/313.json
@@ -20,7 +20,7 @@
           "baseValue": 20.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 3
+            "reference": 8
           }
         },
         {
@@ -29,7 +29,7 @@
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 3
+            "reference": 8
           }
         }
       ],
@@ -47,7 +47,7 @@
       "baseValue": 130.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -55,25 +55,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -81,6 +89,7 @@
   "m_displayName": "ENIRIPSA - LEGENDAIRE - Rufus Le Sensuel",
   "m_availability": 3,
   "m_i18nNameId": 1975,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 49926,
   "assetGuid": "5d21f397a53f9b941b5c276c8cc4357e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/315.json b/data/json/SummoningDefinition/315.json
index 020f24098bfca3e17d6942ca4ecfb9ff607848e8..ed01c20f091dbc415e00e3cd14b983be39051b26 100644
--- a/data/json/SummoningDefinition/315.json
+++ b/data/json/SummoningDefinition/315.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v",
           "baseValue": 12.0,
           "factor": {
@@ -29,7 +29,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 114.0,
       "factor": {
@@ -42,25 +42,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Craquelourd",
   "m_availability": 2,
   "m_i18nNameId": 3161,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 2716,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/317.json b/data/json/SummoningDefinition/317.json
index 1b2398d5b7ad07eaa9b18b12363c12ae56028e06..a19d59863f1897475a8e507c67d47b0608d40548 100644
--- a/data/json/SummoningDefinition/317.json
+++ b/data/json/SummoningDefinition/317.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 30
         }
       ],
       "hasEffects": false,
@@ -31,7 +27,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 83.0,
       "factor": {
@@ -44,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Pichon",
   "m_availability": 2,
   "m_i18nNameId": 76089,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 64004,
   "assetGuid": "69db11a465aada04085dcdfaa0de76a7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/319.json b/data/json/SummoningDefinition/319.json
index 2d0179d1aa23cf12c22a7395db1e0f7b8241fa0f..4365c2f7a71d3aa42144001fc3749c41a56cf69c 100644
--- a/data/json/SummoningDefinition/319.json
+++ b/data/json/SummoningDefinition/319.json
@@ -7,28 +7,32 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2637,
+    "defaultSkin": 7892,
     "skins": [
-      2637
+      7892
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 2
+        }
+      ],
+      "hasEffects": true,
       "keywordReferences": [
-        "UNMOVABLE",
-        "ROOTED",
-        "BATTERED",
-        "HUG"
+        "ANGRYDRIVE"
       ]
     },
     "families": [
-      49
+      49,
+      63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 110.0,
+      "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -39,32 +43,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - La Requin",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Bworkette Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 10560,
+  "m_i18nChampionNameId": 41134,
   "m_i18nDescriptionId": 5195,
-  "assetGuid": ""
+  "assetGuid": "45e24ca2296c7a94999cafb517772a6c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/32.json b/data/json/SummoningDefinition/32.json
index b0deb91a901dcd2c33eaf55bc6146c7e9ea53783..b8a096a855501cb05939659f652ec9c6e96e336f 100644
--- a/data/json/SummoningDefinition/32.json
+++ b/data/json/SummoningDefinition/32.json
@@ -31,21 +31,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 16
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -53,6 +61,7 @@
   "m_displayName": "OSAMODAS - BETE - Bébé Bouftou",
   "m_availability": 3,
   "m_i18nNameId": 28413,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 48468,
   "assetGuid": "3751eaeeabfd62a448da7263f5591c9d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/322.json b/data/json/SummoningDefinition/322.json
index 455914dd8b30f0d0c829178110c542369f0c16f1..1a7336d273522506a843bc6f5871fe802bb18305 100644
--- a/data/json/SummoningDefinition/322.json
+++ b/data/json/SummoningDefinition/322.json
@@ -13,13 +13,7 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 6
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": []
     },
@@ -27,7 +21,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 86.0,
       "factor": {
@@ -40,25 +34,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 150
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 24.0,
+      "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 150
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 150
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +84,7 @@
   "m_displayName": "MONSTRE CHAFER - Châtreuse",
   "m_availability": 3,
   "m_i18nNameId": 53373,
+  "m_i18nChampionNameId": 47436,
   "m_i18nDescriptionId": 64225,
   "assetGuid": "d96d5ace8614b1a47ba47e82af1156e7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/323.json b/data/json/SummoningDefinition/323.json
index 1a16b0b1df4ae40fc97b6e9bf0b5b382309d504a..b2e38d78a3f838fae8adf94354e45b0288e10bf2 100644
--- a/data/json/SummoningDefinition/323.json
+++ b/data/json/SummoningDefinition/323.json
@@ -32,7 +32,7 @@
       "baseValue": 160.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +90,7 @@
   "m_displayName": "GEMME - Esprit de la Terre",
   "m_availability": 3,
   "m_i18nNameId": 54528,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 61463,
   "assetGuid": "841aae171b7aff44c9d0b2f542f137b9"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/327.json b/data/json/SummoningDefinition/327.json
index 5ecf6262eba4eb35319b16d79468634c85510760..92ef61166b4c9381f6e4e909cb0c29c79f1fb91c 100644
--- a/data/json/SummoningDefinition/327.json
+++ b/data/json/SummoningDefinition/327.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.8,
       "factor": 1.2
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Mini Dragon Marron",
   "m_availability": 2,
   "m_i18nNameId": 14941,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 22761,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/329.json b/data/json/SummoningDefinition/329.json
index b565e61799c8bbdfe0fd7ece5339b146cb8f82ea..ed02ad9238a2ad12818ae8ab1bafd2ceb02cbbcf 100644
--- a/data/json/SummoningDefinition/329.json
+++ b/data/json/SummoningDefinition/329.json
@@ -33,22 +33,30 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 4.5,
       "factor": 0.5
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Larve",
   "m_availability": 2,
   "m_i18nNameId": 88427,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 5109,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/33.json b/data/json/SummoningDefinition/33.json
index 5efafbac00fbf8610f72850063d6e5464fd7e08d..6bfab1bd384c3e5dd5da0e5d1de221cab9e333e6 100644
--- a/data/json/SummoningDefinition/33.json
+++ b/data/json/SummoningDefinition/33.json
@@ -28,16 +28,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -45,6 +53,7 @@
   "m_displayName": "TEST - Poutch Ingball",
   "m_availability": 2,
   "m_i18nNameId": 20679,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 95164,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/330.json b/data/json/SummoningDefinition/330.json
index 19dd03eb8ed67ffe681f0c6dec08403343efcac1..3179209c495432bc6e438a17c8c53d8805ac85f8 100644
--- a/data/json/SummoningDefinition/330.json
+++ b/data/json/SummoningDefinition/330.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 34
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Byssal",
   "m_availability": 2,
   "m_i18nNameId": 47922,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 18541,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/332.json b/data/json/SummoningDefinition/332.json
index ff209c90cb68a54b6e1d803a1d1822fe0e2d4e2d..0e55ad9896fe259a4bcd44a7e6d4d0e1272642a8 100644
--- a/data/json/SummoningDefinition/332.json
+++ b/data/json/SummoningDefinition/332.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
@@ -29,7 +25,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 107.0,
       "factor": {
@@ -42,18 +38,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
@@ -61,6 +47,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +72,7 @@
   "m_displayName": "MONSTRE TAURE - Taurrida",
   "m_availability": 2,
   "m_i18nNameId": 25454,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 60000,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/333.json b/data/json/SummoningDefinition/333.json
index ae7dc6a360b6d532e884cd590d71f8592877c958..b4c496cf83b87fb454c54e870ce1dd63e199f195 100644
--- a/data/json/SummoningDefinition/333.json
+++ b/data/json/SummoningDefinition/333.json
@@ -13,20 +13,30 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "cmin",
+          "value": 2
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "cmax",
+          "value": 3
+        }
+      ],
+      "hasEffects": true,
       "keywordReferences": [
-        "NECROSED",
-        "LIFESTEAL"
+        "SHIELD"
       ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 87.0,
+      "baseValue": 92.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -37,32 +47,57 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Bardos le Désosseur",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Blockmort Surin",
+  "m_availability": 3,
   "m_i18nNameId": 70491,
+  "m_i18nChampionNameId": 38768,
   "m_i18nDescriptionId": 84108,
   "assetGuid": "74a541956ccb148409a4ce6156fbe6f0"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/335.json b/data/json/SummoningDefinition/335.json
index 8cdb49d4206ba5b31711551647b1953527ac2a16..04d7f2016dad0b96944aa7aa648137f100cf4678 100644
--- a/data/json/SummoningDefinition/335.json
+++ b/data/json/SummoningDefinition/335.json
@@ -21,7 +21,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 75.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Tofoune",
   "m_availability": 2,
   "m_i18nNameId": 34205,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 7936,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/336.json b/data/json/SummoningDefinition/336.json
index b93b4db9c8c9fa87eeaf84068cc547034fdfe4cc..10be0f4d5253babce53fa3577ecbf8a293637763 100644
--- a/data/json/SummoningDefinition/336.json
+++ b/data/json/SummoningDefinition/336.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv2",
           "baseValue": 75.0,
           "factor": {
@@ -22,7 +22,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv1",
           "baseValue": 50.0,
           "factor": {
@@ -38,7 +38,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 50.0,
       "factor": {
@@ -51,25 +51,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -77,6 +85,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Petite Horde",
   "m_availability": 2,
   "m_i18nNameId": 99241,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 20777,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/338.json b/data/json/SummoningDefinition/338.json
index a2a3ed394cf82f470c62d6d64d319b84a72064ba..3dc759350850e596f4ce2071d2cacc768feaa939 100644
--- a/data/json/SummoningDefinition/338.json
+++ b/data/json/SummoningDefinition/338.json
@@ -35,22 +35,30 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.1,
       "factor": 1.9
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Abrak\u0027Nid Bagarreur",
   "m_availability": 2,
   "m_i18nNameId": 87081,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 48729,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/34.json b/data/json/SummoningDefinition/34.json
index af7a70aeb9a779dd79ef70ac2145e2fd913ff6d2..7cf4eaca0da8c5d172203ab20d942acc8ccf1c88 100644
--- a/data/json/SummoningDefinition/34.json
+++ b/data/json/SummoningDefinition/34.json
@@ -31,16 +31,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -48,6 +56,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Oeuf Vert",
   "m_availability": 2,
   "m_i18nNameId": 21862,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 64147,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/347.json b/data/json/SummoningDefinition/347.json
index 9e6e6283b4a901110880f581db75d80bc8fefb5f..688d2ac72c16cb01e01aa85caec36303572f8d17 100644
--- a/data/json/SummoningDefinition/347.json
+++ b/data/json/SummoningDefinition/347.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Dragon Rouge",
   "m_availability": 2,
   "m_i18nNameId": 43487,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 50875,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/349.json b/data/json/SummoningDefinition/349.json
index 43d185626aea8351d529c6580793744c2077fc48..b8877348b6cefef8d2bb7bda18316e99c307ff51 100644
--- a/data/json/SummoningDefinition/349.json
+++ b/data/json/SummoningDefinition/349.json
@@ -33,7 +33,7 @@
       "baseValue": 120.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -41,25 +41,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -67,6 +91,7 @@
   "m_displayName": "GEMME - Esprit de l\u0027Air",
   "m_availability": 3,
   "m_i18nNameId": 88140,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 58097,
   "assetGuid": "00677c51886f2a94ea62a4e155463c95"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/35.json b/data/json/SummoningDefinition/35.json
index 9fce909ea512e201b2973233987ddec04e49543d..d5b58557508c896c8d57ad69346bf1f643faf328 100644
--- a/data/json/SummoningDefinition/35.json
+++ b/data/json/SummoningDefinition/35.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 30
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE PICHON - Poulp Encreur",
   "m_availability": 2,
   "m_i18nNameId": 70895,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 59052,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/350.json b/data/json/SummoningDefinition/350.json
index 65acc832f71a232265636243ecea21dba25c0ca1..a87df8ae174dd0ebe38b8d498ab453832a2d953a 100644
--- a/data/json/SummoningDefinition/350.json
+++ b/data/json/SummoningDefinition/350.json
@@ -14,9 +14,10 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
-        "METEOR"
+        "METEOR",
+        "UNIQUE"
       ]
     },
     "families": [
@@ -28,7 +29,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -36,21 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 0
+      "baseValue": 10.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 9
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +87,7 @@
   "m_displayName": "IOP - Âme Volcanique",
   "m_availability": 3,
   "m_i18nNameId": 75538,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 49584,
   "assetGuid": "241cf55694ec2da4aaa3f15920d9162a"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/351.json b/data/json/SummoningDefinition/351.json
index 34d937187fc0365c4f85acb6a131d8c7a8a2757b..b68b1e7e764e53d50e24b316991690e20eb3370f 100644
--- a/data/json/SummoningDefinition/351.json
+++ b/data/json/SummoningDefinition/351.json
@@ -12,15 +12,6 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 10.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
@@ -39,7 +30,7 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -52,25 +43,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -84,6 +83,7 @@
   "m_displayName": "MONSTRE COCHON - GARDIEN - Collision",
   "m_availability": 2,
   "m_i18nNameId": 21883,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 15569,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/353.json b/data/json/SummoningDefinition/353.json
index b7582623348a463aee615b9d560baff739850e74..937540613215a628d0016d72692942057d2fccbb 100644
--- a/data/json/SummoningDefinition/353.json
+++ b/data/json/SummoningDefinition/353.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "QUETE GELEE - Gelikorne",
   "m_availability": 2,
   "m_i18nNameId": 78092,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 67470,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/355.json b/data/json/SummoningDefinition/355.json
index 5c4b88ba1fef30611dcf2725d69328addab9c1ce..ceef31db63a111c738180e87ee368cae3ab4f7d2 100644
--- a/data/json/SummoningDefinition/355.json
+++ b/data/json/SummoningDefinition/355.json
@@ -13,17 +13,35 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "min",
+          "value": 1
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "max",
+          "value": 2
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "v",
+          "value": -1
+        }
+      ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 95.0,
+      "baseValue": 71.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,32 +52,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 21.0,
+      "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Mossaka",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Picoss Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 66239,
+  "m_i18nChampionNameId": 28593,
   "m_i18nDescriptionId": 75618,
   "assetGuid": "20ea7b08bbb001a46af188c27927b1d4"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/362.json b/data/json/SummoningDefinition/362.json
index 942531b42a683521e47d09babe7105cb10395ecc..21142a674de319c26f1fb1fc7d49574396af1070 100644
--- a/data/json/SummoningDefinition/362.json
+++ b/data/json/SummoningDefinition/362.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "v",
           "baseValue": 5.0,
           "factor": {
@@ -29,7 +29,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 120.0,
       "factor": {
@@ -42,18 +42,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
@@ -61,6 +51,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - Craconneur",
   "m_availability": 2,
   "m_i18nNameId": 96514,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 61504,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/364.json b/data/json/SummoningDefinition/364.json
index 00b4d756b6955deb50a625a0ecd7bd137fed1254..cd078793f3f05a2884e4d9035b536f195e6fe35a 100644
--- a/data/json/SummoningDefinition/364.json
+++ b/data/json/SummoningDefinition/364.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 12.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 60
         }
       ],
       "hasEffects": true,
@@ -31,7 +27,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 86.0,
       "factor": {
@@ -44,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Chef de Guerre",
   "m_availability": 2,
   "m_i18nNameId": 48215,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 41980,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/365.json b/data/json/SummoningDefinition/365.json
index adf244d4fc95e9083eb937254d461f997f7f039a..5040ffe3415beb6db09ba18119f5f851129cbc3b 100644
--- a/data/json/SummoningDefinition/365.json
+++ b/data/json/SummoningDefinition/365.json
@@ -35,7 +35,7 @@
       51
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 95.0,
       "factor": {
@@ -48,25 +48,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -74,6 +82,7 @@
   "m_displayName": "MONSTRE GELEE - Nounours",
   "m_availability": 2,
   "m_i18nNameId": 77695,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 20749,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/368.json b/data/json/SummoningDefinition/368.json
index 595f2674bf1b68e3fb87d160b885c8e551251b8d..3e6f8130e1da7cfc88315c1fca428976635ad59d 100644
--- a/data/json/SummoningDefinition/368.json
+++ b/data/json/SummoningDefinition/368.json
@@ -13,16 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 25
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 12.0,
           "factor": {
@@ -38,7 +34,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 188.0,
       "factor": {
@@ -51,25 +47,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -83,6 +87,7 @@
   "m_displayName": "MONSTRE CHAFER - GARDIEN - Azor l\u0027Exécuteur",
   "m_availability": 2,
   "m_i18nNameId": 98348,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 40989,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/370.json b/data/json/SummoningDefinition/370.json
index 202d4ca9915427b652a76c8c56686ae541b3343e..ccdfc7410dfe178d8a2602f89b1a497db83ead8f 100644
--- a/data/json/SummoningDefinition/370.json
+++ b/data/json/SummoningDefinition/370.json
@@ -31,16 +31,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -48,6 +56,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Oeuf Bleu",
   "m_availability": 2,
   "m_i18nNameId": 32089,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 84478,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/372.json b/data/json/SummoningDefinition/372.json
index e7272611fd31478dc4536d1946b2e2f4576f0b0f..b76f829a0e11c092fba448a8587d94d40025c22f 100644
--- a/data/json/SummoningDefinition/372.json
+++ b/data/json/SummoningDefinition/372.json
@@ -22,7 +22,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 80.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -79,6 +87,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Archers 1 (Bronze)",
   "m_availability": 2,
   "m_i18nNameId": 7751,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 11250,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/375.json b/data/json/SummoningDefinition/375.json
index 4658a03aa1739d013d048caf5ca8025ae9da5176..19f0f3a5a2ca246fce08a768619062072dccfde0 100644
--- a/data/json/SummoningDefinition/375.json
+++ b/data/json/SummoningDefinition/375.json
@@ -22,7 +22,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 91.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -79,6 +87,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Archers 2 (Argent)",
   "m_availability": 2,
   "m_i18nNameId": 42096,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 98741,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/376.json b/data/json/SummoningDefinition/376.json
index 0df82cceaab536fe8ef2fe12b70c764a2a62f19c..d4cf71d90403e6631a6296e7e46966e7237ddf67 100644
--- a/data/json/SummoningDefinition/376.json
+++ b/data/json/SummoningDefinition/376.json
@@ -15,30 +15,30 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "min",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 1
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -62,7 +62,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 91.0,
       "factor": {
@@ -75,25 +75,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -101,6 +109,7 @@
   "m_displayName": "MONSTRE BWORK - Bwork Parle-Lave",
   "m_availability": 3,
   "m_i18nNameId": 70636,
+  "m_i18nChampionNameId": 49150,
   "m_i18nDescriptionId": 90390,
   "assetGuid": "44d8ca9cb05ba844a995132723599cb2"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/378.json b/data/json/SummoningDefinition/378.json
index 6e54548acf2d55dfcf9a4e86a72ae3e8aadd1ad5..253c89a89305d24cfcc76a08291b7bd1f5b5825c 100644
--- a/data/json/SummoningDefinition/378.json
+++ b/data/json/SummoningDefinition/378.json
@@ -7,9 +7,9 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2857,
+    "defaultSkin": 298,
     "skins": [
-      2857
+      298
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -18,18 +18,60 @@
           "type": "ConstIntegerValue",
           "referenceId": "v",
           "value": 100
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 2
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "min",
+          "baseValue": 15.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 11
+          }
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 18.4,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 11
+          }
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "h",
+          "baseValue": 12.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        {
+          "type": 25,
+          "id": 589
+        }
+      ]
     },
     "families": [
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 90.0,
+      "baseValue": 91.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -40,32 +82,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Bwork Beau Parleur",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Parle-Lave Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 22542,
+  "m_i18nChampionNameId": 31279,
   "m_i18nDescriptionId": 16236,
-  "assetGuid": ""
+  "assetGuid": "9606f57e1c3990741a688614058d1444"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/38.json b/data/json/SummoningDefinition/38.json
index c37725b228fb53b47164317d058040332e2ac810..e8cf99b324506894f24729115ea807f785b1eef7 100644
--- a/data/json/SummoningDefinition/38.json
+++ b/data/json/SummoningDefinition/38.json
@@ -7,33 +7,40 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 8504,
     "skins": [
-      1
+      8504
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 8.0,
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "dm",
+          "baseValue": 24.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "ar",
+          "value": 5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "EXALTED"
+      ]
     },
     "families": [
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 100.0,
+      "baseValue": 93.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -44,32 +51,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-      "referenceId": "",
-      "baseValue": 16.0,
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
+      "referenceId": "dm",
+      "baseValue": 24.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Musi\u0027Bwork",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Bworkokak Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 36973,
+  "m_i18nChampionNameId": 8475,
   "m_i18nDescriptionId": 43993,
-  "assetGuid": ""
+  "assetGuid": "64b195e2bce8c914d8a9a96b54fdf21c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/382.json b/data/json/SummoningDefinition/382.json
index a04760640cbb3b6a9e6979fad472883ad226fff6..cdf3e1b94237c0b6a7eb14c928d4331d6bd9924b 100644
--- a/data/json/SummoningDefinition/382.json
+++ b/data/json/SummoningDefinition/382.json
@@ -30,7 +30,7 @@
       "baseValue": 56.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "OSAMODAS - Sale Bête Infâme",
   "m_availability": 3,
   "m_i18nNameId": 16655,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 73877,
   "assetGuid": "c256b508359f2e546a6e20106fc9958c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/393.json b/data/json/SummoningDefinition/393.json
index ec0cef9eea6e21c9cf741fdb0f749f84eb7f92b9..881b2282330fe662f3e19536bef741b81e586d64 100644
--- a/data/json/SummoningDefinition/393.json
+++ b/data/json/SummoningDefinition/393.json
@@ -27,7 +27,7 @@
       61
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 85.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 21.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Boufpoux",
   "m_availability": 2,
   "m_i18nNameId": 8670,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 11254,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/394.json b/data/json/SummoningDefinition/394.json
index c69223301f58799e510b161d1b957c9a0e41e7da..0087244b984eb25dea9ee635f7bd8578b3fa6302 100644
--- a/data/json/SummoningDefinition/394.json
+++ b/data/json/SummoningDefinition/394.json
@@ -24,7 +24,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 84.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Fantassins 2 (Argent)",
   "m_availability": 2,
   "m_i18nNameId": 9467,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 27907,
   "assetGuid": "cb2c2e7d842460048a01bc52edefef04"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/396.json b/data/json/SummoningDefinition/396.json
index 90b0a52024705b65afe60fac32acf23c64e8a3b8..a41b2ad31cef76a1c94fcea66e2dca91c3ccb744 100644
--- a/data/json/SummoningDefinition/396.json
+++ b/data/json/SummoningDefinition/396.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 15
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Glob",
   "m_availability": 2,
   "m_i18nNameId": 19368,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 68701,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/397.json b/data/json/SummoningDefinition/397.json
index 7a692993ed59a7afee1cd43708d69459f9f528f9..001496094d62672401f9e7704c3b91a99a6ab1f9 100644
--- a/data/json/SummoningDefinition/397.json
+++ b/data/json/SummoningDefinition/397.json
@@ -19,7 +19,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 80.0,
       "factor": {
@@ -32,25 +32,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Craqueboule",
   "m_availability": 2,
   "m_i18nNameId": 59184,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 15855,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/398.json b/data/json/SummoningDefinition/398.json
index bd990c676020cb565f7728e0eccdb7a24fac9248..cd28db772f8453157a7f960c206620d5106f0fd1 100644
--- a/data/json/SummoningDefinition/398.json
+++ b/data/json/SummoningDefinition/398.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - [Boss] Huitre",
   "m_availability": 2,
   "m_i18nNameId": 85988,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 33224,
   "assetGuid": "9adfb6b99c0bc1941a0e9b295ed65b92"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/40.json b/data/json/SummoningDefinition/40.json
index 0f10041a35f0779db30dfb2e8d743f0598414239..2ec48b7a41dcbf0f017f97e96d664de8d85c6198 100644
--- a/data/json/SummoningDefinition/40.json
+++ b/data/json/SummoningDefinition/40.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 03",
   "m_availability": 2,
   "m_i18nNameId": 45803,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 91273,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/402.json b/data/json/SummoningDefinition/402.json
index 0e06f189b862832caee72e52e13b7c5413de3e0d..a6d6800345c016065d57a0c2a7228fa6932c5bfa 100644
--- a/data/json/SummoningDefinition/402.json
+++ b/data/json/SummoningDefinition/402.json
@@ -15,12 +15,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -32,7 +32,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 95.0,
       "factor": {
@@ -45,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -71,6 +79,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Chevalier Porté",
   "m_availability": 2,
   "m_i18nNameId": 3320,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 50073,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/406.json b/data/json/SummoningDefinition/406.json
index 79d726d7f43d087d72acf84a01458332391318b4..4cf35f215a823b43f2ffbd3cc6ac232572602a00 100644
--- a/data/json/SummoningDefinition/406.json
+++ b/data/json/SummoningDefinition/406.json
@@ -15,12 +15,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 18.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -34,7 +34,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 77.0,
       "factor": {
@@ -47,25 +47,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -73,6 +81,7 @@
   "m_displayName": "MONSTRE BWORK - Larbin Monté",
   "m_availability": 3,
   "m_i18nNameId": 91800,
+  "m_i18nChampionNameId": 81901,
   "m_i18nDescriptionId": 28858,
   "assetGuid": "a0f0841eb0d38ff4b91d0697a094dc0a"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/408.json b/data/json/SummoningDefinition/408.json
index 89e1dde8d4578d63b7aef3f345832dbb5ab8dd64..1423b3360e721e79cd7f5715caabcb423e452782 100644
--- a/data/json/SummoningDefinition/408.json
+++ b/data/json/SummoningDefinition/408.json
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 17
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "OSAMODAS - BETE - Jeune Prespic",
   "m_availability": 3,
   "m_i18nNameId": 49455,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 9227,
   "assetGuid": "a3ca57263ad01594984445a612ac4954"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/414.json b/data/json/SummoningDefinition/414.json
index 5fb61e8a979d73d4428a34565203eddb35a0d510..7650eebc43404c2a1ffd803479b3c24696f5df61 100644
--- a/data/json/SummoningDefinition/414.json
+++ b/data/json/SummoningDefinition/414.json
@@ -17,7 +17,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 5
+          "value": 30
         }
       ],
       "hasEffects": true,
@@ -34,32 +34,46 @@
       36
     ],
     "life": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 121.0,
-      "factor": 23.5
+      "baseValue": 145.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 0
+      }
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 15.0,
-      "factor": 2.3
+      "baseValue": 17.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 1
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -67,6 +81,7 @@
   "m_displayName": "MONSTRE BOUFTOU - BOSS - Grand Laineux",
   "m_availability": 2,
   "m_i18nNameId": 398,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 79589,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/416.json b/data/json/SummoningDefinition/416.json
index 29b987f9aebeab00cba801940e9a9c294c97f99b..d1bca90942cf1611e69474be9964104614f20462 100644
--- a/data/json/SummoningDefinition/416.json
+++ b/data/json/SummoningDefinition/416.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 25.0,
           "factor": {
@@ -22,13 +22,9 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 1.4,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 10
         }
       ],
       "hasEffects": true,
@@ -40,7 +36,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 250.0,
       "factor": {
@@ -53,16 +49,24 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE TOFU - Boss de donjon - Vénérable Tofu",
   "m_availability": 2,
   "m_i18nNameId": 93086,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 13431,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/42.json b/data/json/SummoningDefinition/42.json
index cf9944ad5a5ff174544fc5f385a588af2c14762b..c924674b71b7079dd144d11df1b6e35af419b16c 100644
--- a/data/json/SummoningDefinition/42.json
+++ b/data/json/SummoningDefinition/42.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "hp",
           "baseValue": 20.0,
           "factor": {
@@ -37,7 +37,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -50,16 +50,24 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -67,6 +75,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Bouflonne",
   "m_availability": 2,
   "m_i18nNameId": 58258,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 94472,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/425.json b/data/json/SummoningDefinition/425.json
index 99f29309a84bdcb5cd700115ef95084c6a9eef71..0ea9a34a2dfa78b88d1fe2b2581112fa9c6b14ca 100644
--- a/data/json/SummoningDefinition/425.json
+++ b/data/json/SummoningDefinition/425.json
@@ -16,22 +16,20 @@
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "dmg",
-          "value": 100
+          "referenceId": "at",
+          "value": 60
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "FROZEN"
-      ]
+      "keywordReferences": []
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 93.0,
+      "baseValue": 102.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -42,25 +40,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 15.0,
+      "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -72,15 +78,16 @@
       "max": {
         "type": "ConstIntegerValue",
         "referenceId": "",
-        "value": 5
+        "value": 4
       }
     },
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Bolos-le-Niais",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Crogneur Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 26155,
+  "m_i18nChampionNameId": 78042,
   "m_i18nDescriptionId": 73938,
   "assetGuid": "eab81176dbaa81142bffde33ddb7b58e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/426.json b/data/json/SummoningDefinition/426.json
index 3b13b95abcd714376ea48342099eb44e2fe452bd..558e3848ec758889bda6009c48664882485fedde 100644
--- a/data/json/SummoningDefinition/426.json
+++ b/data/json/SummoningDefinition/426.json
@@ -35,7 +35,7 @@
       "baseValue": 91.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -43,25 +43,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +77,7 @@
   "m_displayName": "OSAMODAS - LEGENDAIRE - Dragonneur",
   "m_availability": 3,
   "m_i18nNameId": 50526,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 60870,
   "assetGuid": "371da43622e96e24c904e9d92b8acc2c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/428.json b/data/json/SummoningDefinition/428.json
index df07de3169fc8f61208d67c0b38436a13f7c2d1b..96bbd6b8204e8431b023018d6e75a6365039139a 100644
--- a/data/json/SummoningDefinition/428.json
+++ b/data/json/SummoningDefinition/428.json
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "OSAMODAS - BETE - Bébé Craqueleur",
   "m_availability": 3,
   "m_i18nNameId": 22733,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 61581,
   "assetGuid": "0f0a34ca07b373b47bc4d584062e9467"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/429.json b/data/json/SummoningDefinition/429.json
index 91e801e847717408e068e971319f509cb310ab0a..e4cf269ae14e445294800365a2eb9a3b30969e9c 100644
--- a/data/json/SummoningDefinition/429.json
+++ b/data/json/SummoningDefinition/429.json
@@ -24,7 +24,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 71.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +71,7 @@
   "m_displayName": "MONSTRE BWORK - Larbin",
   "m_availability": 3,
   "m_i18nNameId": 85500,
+  "m_i18nChampionNameId": 67040,
   "m_i18nDescriptionId": 82220,
   "assetGuid": "089862af5a83b6f47b6015e1db57cc72"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/432.json b/data/json/SummoningDefinition/432.json
index 271527501505dab7a8fea773ae363c54a7329fa3..5f843124fcf10bd24a9f120049e9fd6bfb4ccd7e 100644
--- a/data/json/SummoningDefinition/432.json
+++ b/data/json/SummoningDefinition/432.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "AT",
-          "baseValue": 15.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 100
         }
       ],
       "hasEffects": true,
@@ -31,7 +27,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 120.0,
       "factor": {
@@ -44,18 +40,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
@@ -63,6 +49,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - L\u0027enrouleur",
   "m_availability": 2,
   "m_i18nNameId": 34184,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 74958,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/44.json b/data/json/SummoningDefinition/44.json
index ed280a19085898603cf30b181cf1552b7e4fe424..df913825369076e05f991d84d8fc89adb2deb67a 100644
--- a/data/json/SummoningDefinition/44.json
+++ b/data/json/SummoningDefinition/44.json
@@ -21,7 +21,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 98.0,
       "factor": {
@@ -34,18 +34,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
@@ -53,6 +43,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - King Pin",
   "m_availability": 2,
   "m_i18nNameId": 16423,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 3480,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/441.json b/data/json/SummoningDefinition/441.json
index d4f5790250c7199683e2ccf7678817652f5ba1dd..87474650554430bb7539d182f06f83290b92cb40 100644
--- a/data/json/SummoningDefinition/441.json
+++ b/data/json/SummoningDefinition/441.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "atk",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 20
         }
       ],
       "hasEffects": true,
@@ -36,7 +32,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 218.0,
       "factor": {
@@ -49,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1000
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -75,6 +79,7 @@
   "m_displayName": "MONSTRE COCHON - Empereur Guemene en Deuil",
   "m_availability": 3,
   "m_i18nNameId": 35365,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 54202,
   "assetGuid": "48ca3d1474b19a140badc2419510ed09"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/442.json b/data/json/SummoningDefinition/442.json
index 406c5ad51588386610e585ce82fb22c4069fa679..e34b7d09ae3c02d8e2997a64074fbf5093ec396f 100644
--- a/data/json/SummoningDefinition/442.json
+++ b/data/json/SummoningDefinition/442.json
@@ -27,7 +27,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE CHAFER - Kasimordo",
   "m_availability": 3,
   "m_i18nNameId": 65582,
+  "m_i18nChampionNameId": 7394,
   "m_i18nDescriptionId": 69970,
   "assetGuid": "1dac012f75e9a27429cb3f619db85b75"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/443.json b/data/json/SummoningDefinition/443.json
index 6ae6101f5a3b2c706dc6fa605835b66ce3f611f6..62f16433e0d352c6063a04beb88c052134fe3e8a 100644
--- a/data/json/SummoningDefinition/443.json
+++ b/data/json/SummoningDefinition/443.json
@@ -19,7 +19,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 84.0,
       "factor": {
@@ -32,18 +32,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
@@ -51,6 +41,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE TAURE - Mooman",
   "m_availability": 2,
   "m_i18nNameId": 40799,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 87216,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/446.json b/data/json/SummoningDefinition/446.json
index d30ff07afedcb4b84a4191d24fba63dbe8b358f1..065d1a0b0eeb38676bd860f86f95c5dabd501e17 100644
--- a/data/json/SummoningDefinition/446.json
+++ b/data/json/SummoningDefinition/446.json
@@ -15,19 +15,19 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmgC",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "pv",
+          "value": 50
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "att",
+          "value": 25
         }
       ],
-      "hasEffects": false,
+      "hasEffects": true,
       "keywordReferences": [
         "PADMAAURA",
-        "COLLISION",
         "DIRTY"
       ]
     },
@@ -36,9 +36,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 106.0,
+      "baseValue": 101.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -49,32 +49,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Grack Torrance",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Guerrier Boudeur Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 98103,
+  "m_i18nChampionNameId": 2627,
   "m_i18nDescriptionId": 34359,
   "assetGuid": "098db99d01b12f14c9841a60c23ac274"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/45.json b/data/json/SummoningDefinition/45.json
index 49748dff98a2b35e8bd64d4d78fd98c3533e5056..6d06c9cb1ac127a96bc024b8f473c9d4fec3b1cf 100644
--- a/data/json/SummoningDefinition/45.json
+++ b/data/json/SummoningDefinition/45.json
@@ -25,7 +25,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 120.0,
       "factor": {
@@ -38,18 +38,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
@@ -57,6 +47,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -77,6 +85,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - Lance-Roche",
   "m_availability": 2,
   "m_i18nNameId": 57945,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 6399,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/452.json b/data/json/SummoningDefinition/452.json
index 708c7b6d5a367bbb1c8d2809afd8c1a86c76f478..4c4dffa6f4838e3d4076bf5b8e29613e3a69ebef 100644
--- a/data/json/SummoningDefinition/452.json
+++ b/data/json/SummoningDefinition/452.json
@@ -15,12 +15,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -34,7 +34,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 95.0,
       "factor": {
@@ -47,25 +47,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -73,6 +81,7 @@
   "m_displayName": "MONSTRE BWORK - Bworkette",
   "m_availability": 3,
   "m_i18nNameId": 6965,
+  "m_i18nChampionNameId": 76765,
   "m_i18nDescriptionId": 9280,
   "assetGuid": "7f8158efaf017824f9010ddaa115ef95"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/456.json b/data/json/SummoningDefinition/456.json
index 7d0aa8ce4bb43055180011d82f857004b4d23f22..3029cd3a82f06716dfa2f58a8b60d4bb795e327d 100644
--- a/data/json/SummoningDefinition/456.json
+++ b/data/json/SummoningDefinition/456.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 15
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE RAT - Rat Cunier",
   "m_availability": 2,
   "m_i18nNameId": 45628,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 16677,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/458.json b/data/json/SummoningDefinition/458.json
index 4b8a0d700ab15dfc01abd08f573917e2b11aa19a..a785b97cc72c076fef776d81039f81a0197ea1b3 100644
--- a/data/json/SummoningDefinition/458.json
+++ b/data/json/SummoningDefinition/458.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 40
         }
       ],
       "hasEffects": true,
@@ -31,9 +27,9 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 45.6,
+      "baseValue": 46.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -44,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Bouftou de Berger",
   "m_availability": 2,
   "m_i18nNameId": 63788,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 13269,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/464.json b/data/json/SummoningDefinition/464.json
index afadf8ba62ebf329bbd1bc721fe4008baab4a8b9..6bd8296ff81a85c02adf80e2b27d018718631634 100644
--- a/data/json/SummoningDefinition/464.json
+++ b/data/json/SummoningDefinition/464.json
@@ -13,7 +13,13 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 70
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         {
@@ -30,9 +36,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 186.0,
+      "baseValue": 176.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -43,25 +49,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +91,7 @@
   "m_displayName": "MONSTRE CHAFER - Grignoteur",
   "m_availability": 3,
   "m_i18nNameId": 22178,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 35067,
   "assetGuid": "b8d05fd4afc828248b3a759074626046"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/465.json b/data/json/SummoningDefinition/465.json
index 3ce30bb41f3b61234f88c98ee6bbdd5c1ecaa444..5c687489b20b48e2a5ca49356b622cf17aae3b22 100644
--- a/data/json/SummoningDefinition/465.json
+++ b/data/json/SummoningDefinition/465.json
@@ -21,7 +21,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 89.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Croqueur",
   "m_availability": 2,
   "m_i18nNameId": 50437,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 90193,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/466.json b/data/json/SummoningDefinition/466.json
index 77150a322c27229bbb1d58f763d52266788f79c8..7398e663763d27364ad57590abbafe1226cf2854 100644
--- a/data/json/SummoningDefinition/466.json
+++ b/data/json/SummoningDefinition/466.json
@@ -24,7 +24,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 90.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -76,6 +84,7 @@
   "m_displayName": "MONSTRE BWORK - Traqueur",
   "m_availability": 3,
   "m_i18nNameId": 74322,
+  "m_i18nChampionNameId": 25634,
   "m_i18nDescriptionId": 64626,
   "assetGuid": "2e9f338af19334346a3ea7b0d7b025be"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/47.json b/data/json/SummoningDefinition/47.json
index 0fd9f39e839d38c9d9d73c9db3d6f924f2a8d5de..22ae7b1589c4c68cb6b59d469fc0608ec83d89a0 100644
--- a/data/json/SummoningDefinition/47.json
+++ b/data/json/SummoningDefinition/47.json
@@ -17,7 +17,6 @@
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
-        "BATSU",
         "SHIELD",
         "DOUBLE",
         "PORSHIDO"
@@ -28,7 +27,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 106.0,
       "factor": {
@@ -41,32 +40,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Double d\u0027Orochimagrouik",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Double de Guerrier Boudeur Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 66353,
+  "m_i18nChampionNameId": 6752,
   "m_i18nDescriptionId": 9824,
   "assetGuid": "68d96c31e4c46d0418791d29eca69d44"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/474.json b/data/json/SummoningDefinition/474.json
index 555e7c5353a01078ec7483dfec8a5b0b0dac2b8f..7d180d45f56de979448aeff11d12d2f0af95097e 100644
--- a/data/json/SummoningDefinition/474.json
+++ b/data/json/SummoningDefinition/474.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 8.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 50
         }
       ],
       "hasEffects": true,
@@ -31,7 +27,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 91.0,
       "factor": {
@@ -44,25 +40,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Tofu Ventripotent",
   "m_availability": 2,
   "m_i18nNameId": 83690,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 70989,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/476.json b/data/json/SummoningDefinition/476.json
index f0f2af00b477f72094b26ac7c23c691edd4c60c9..6ff02402f138427b2372797aa0f640fc8de1e987 100644
--- a/data/json/SummoningDefinition/476.json
+++ b/data/json/SummoningDefinition/476.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 8.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 80
         },
         {
           "type": "ConstIntegerValue",
@@ -39,7 +35,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 111.0,
       "factor": {
@@ -52,25 +48,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "customActionTarget": {
       "type": "FilteredEntitySelector",
       "from": {
@@ -96,6 +100,7 @@
   "m_displayName": "MONSTRE BWORK - Gro Bwork",
   "m_availability": 3,
   "m_i18nNameId": 4727,
+  "m_i18nChampionNameId": 42644,
   "m_i18nDescriptionId": 52451,
   "assetGuid": "bd81fe5b48c6c364489dac373b1f00dc"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/477.json b/data/json/SummoningDefinition/477.json
index 56b81b8210af18068e7bc199b3f5fb4cbb086bae..1257420c3fac0d820322c9fbab2bbba8a3016150 100644
--- a/data/json/SummoningDefinition/477.json
+++ b/data/json/SummoningDefinition/477.json
@@ -25,7 +25,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 62.0,
       "factor": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE COCHON - Ninjadine (Spell)",
   "m_availability": 3,
   "m_i18nNameId": 87377,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 26081,
   "assetGuid": "461621547321e554c9875729f2466eba"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/48.json b/data/json/SummoningDefinition/48.json
index 43a9ba30d11fef8a62c6120e1af00e501009940f..77be7705e036f3a086e51c73591a210d3ac2288b 100644
--- a/data/json/SummoningDefinition/48.json
+++ b/data/json/SummoningDefinition/48.json
@@ -25,7 +25,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 102.0,
       "factor": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -77,6 +85,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Craqueleur Erodé",
   "m_availability": 2,
   "m_i18nNameId": 22319,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 30669,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/482.json b/data/json/SummoningDefinition/482.json
index 7393d6d746661baa2ca97e8dcd14c682a7c1dcd8..eed87769a07c3cd2c2f5b9ee65cf003d62392a47 100644
--- a/data/json/SummoningDefinition/482.json
+++ b/data/json/SummoningDefinition/482.json
@@ -31,7 +31,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 152.0,
       "factor": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +78,7 @@
   "m_displayName": "MONSTRE BWORK - Le Bworkdog sans sa monture",
   "m_availability": 3,
   "m_i18nNameId": 82282,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 88022,
   "assetGuid": "8184d4fa61b6d494e8e8a22ba3540e40"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/483.json b/data/json/SummoningDefinition/483.json
index 78b76aa79f536f8a77b2c342df8d4a10d78e3c39..4c5dde28463c93024d0cc13e1b721f06bdec8949 100644
--- a/data/json/SummoningDefinition/483.json
+++ b/data/json/SummoningDefinition/483.json
@@ -32,7 +32,7 @@
       50
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 65.0,
       "factor": {
@@ -45,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 7.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -71,6 +79,7 @@
   "m_displayName": "MONSTRE COCHON - Porigami",
   "m_availability": 3,
   "m_i18nNameId": 74381,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 81023,
   "assetGuid": "779e7066d5fc5b24bbafb2ce833afeaf"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/484.json b/data/json/SummoningDefinition/484.json
index a6649c8db47747ee93e5532073d6b991083a4e78..1cf689d86383b6c788713b73cccdd8aef9b15c09 100644
--- a/data/json/SummoningDefinition/484.json
+++ b/data/json/SummoningDefinition/484.json
@@ -21,7 +21,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 54.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Boufton",
   "m_availability": 2,
   "m_i18nNameId": 90476,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 66106,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/487.json b/data/json/SummoningDefinition/487.json
index 0628364f78ff402063051d2dd04393460d65dc39..6d78b4c399460035a156bda8903fa194d0c80c5f 100644
--- a/data/json/SummoningDefinition/487.json
+++ b/data/json/SummoningDefinition/487.json
@@ -13,19 +13,33 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": [
-        "LIFESTEAL"
-      ]
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "bo",
+          "value": 20
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "cmin",
+          "value": 4
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "cmax",
+          "value": 5
+        }
+      ],
+      "hasEffects": true,
+      "keywordReferences": []
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 81.0,
+      "baseValue": 34.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -36,32 +50,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 25.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Lester",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Avorton Surin",
+  "m_availability": 3,
   "m_i18nNameId": 77077,
+  "m_i18nChampionNameId": 60530,
   "m_i18nDescriptionId": 78831,
   "assetGuid": "7a74faf08d25f324b9d6a0dd896e3882"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/49.json b/data/json/SummoningDefinition/49.json
index 9479518434c511dac66e93e2835b777c6831f0e7..8eaf174001df35ace1824d532980d5de6697a7d5 100644
--- a/data/json/SummoningDefinition/49.json
+++ b/data/json/SummoningDefinition/49.json
@@ -27,7 +27,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Tofu Foutu",
   "m_availability": 2,
   "m_i18nNameId": 91735,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 75044,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/494.json b/data/json/SummoningDefinition/494.json
index 8bd621306f9a3352933a7b581cccb839d866f01d..5263e1c0f5091638bfe4ad2f4ec4e5b121638f46 100644
--- a/data/json/SummoningDefinition/494.json
+++ b/data/json/SummoningDefinition/494.json
@@ -29,22 +29,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": 3.0
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE TAURE - Minotauror",
   "m_availability": 2,
   "m_i18nNameId": 60540,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 94519,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/495.json b/data/json/SummoningDefinition/495.json
index 00a3dd760f2b84b03659832acd379e6bf46c7c99..7ae51503a49ee02564abc72be332ece57804a3ed 100644
--- a/data/json/SummoningDefinition/495.json
+++ b/data/json/SummoningDefinition/495.json
@@ -13,12 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -32,30 +32,46 @@
       51
     ],
     "life": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 300
+      "baseValue": 300.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 0
+      }
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 15
+      "baseValue": 15.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 1
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +79,7 @@
   "m_displayName": "MONSTRE GELEE - Roi Gélome",
   "m_availability": 2,
   "m_i18nNameId": 7021,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 5453,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/498.json b/data/json/SummoningDefinition/498.json
index 736bcf0d76a1e3de2cca0b507abc4c4913e188bf..ae18cffc4ab2191326d55dd26ef2fa64c5ad4588 100644
--- a/data/json/SummoningDefinition/498.json
+++ b/data/json/SummoningDefinition/498.json
@@ -41,22 +41,30 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 27.0,
       "factor": 3.0
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Anélide la Troncophore",
   "m_availability": 2,
   "m_i18nNameId": 63692,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 21690,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/50.json b/data/json/SummoningDefinition/50.json
index ba81498d03f5a3dd433323fb9ba7e21aa72b90c2..3f1a109b71f1c51b9837d7a5f4f90398f84f6a34 100644
--- a/data/json/SummoningDefinition/50.json
+++ b/data/json/SummoningDefinition/50.json
@@ -13,20 +13,33 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "cmin",
+          "value": 2
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "cmax",
+          "value": 3
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "v",
+          "value": -1
+        }
+      ],
       "hasEffects": true,
-      "keywordReferences": [
-        "NECROSED",
-        "STUN"
-      ]
+      "keywordReferences": []
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 102.0,
+      "baseValue": 92.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -37,32 +50,57 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Krouktos",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Blockmort Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 26206,
+  "m_i18nChampionNameId": 37308,
   "m_i18nDescriptionId": 62445,
   "assetGuid": "2762f6c6283251645b66e6e99a495415"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/500.json b/data/json/SummoningDefinition/500.json
index be739d3e4cf1c89a38b47f3211b1811b985e034f..70796dfcd6a02c51ac147c19cf939f130e28d84c 100644
--- a/data/json/SummoningDefinition/500.json
+++ b/data/json/SummoningDefinition/500.json
@@ -13,14 +13,17 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "LinearLevelOnlyBasedDynamicValue",
+          "referenceId": "ar",
+          "baseValue": 20.0,
+          "factor": 0.1
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
-        "DOUBLE",
-        "CRITICAL",
-        "BATSU",
-        "SHIELD",
         "PORSHIDO"
       ]
     },
@@ -29,9 +32,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 106.0,
+      "baseValue": 101.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -42,32 +45,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Orochimagrouik",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Guerrier Boudeur Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 92689,
+  "m_i18nChampionNameId": 48096,
   "m_i18nDescriptionId": 17641,
   "assetGuid": "68d96c31e4c46d0418791d29eca69d44"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/501.json b/data/json/SummoningDefinition/501.json
index 5cd867aef5724487f195767edd280e392f576c78..777ec64d73e939bb63fd8602b3a5d326a3849b0b 100644
--- a/data/json/SummoningDefinition/501.json
+++ b/data/json/SummoningDefinition/501.json
@@ -19,7 +19,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 90.0,
       "factor": {
@@ -32,18 +32,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
@@ -51,6 +41,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - croquasse",
   "m_availability": 2,
   "m_i18nNameId": 96863,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 91173,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/505.json b/data/json/SummoningDefinition/505.json
index d7a9fb487d79dd34960907dd26d1c6dc8150566b..b95e6746ee2a139e4bbdbc1b12783ce4b16163b9 100644
--- a/data/json/SummoningDefinition/505.json
+++ b/data/json/SummoningDefinition/505.json
@@ -26,7 +26,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 85.0,
       "factor": {
@@ -39,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 1000
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -65,6 +73,7 @@
   "m_displayName": "MONSTRE COCHON - Disciple Cochonnet",
   "m_availability": 3,
   "m_i18nNameId": 15111,
+  "m_i18nChampionNameId": 6695,
   "m_i18nDescriptionId": 83630,
   "assetGuid": "aa9fdd04eefa741408bb01e6e41f0c5c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/506.json b/data/json/SummoningDefinition/506.json
index 657d7eef9cf33d7c0f11caa1070ef0b3e2e508b8..979732139ec9bc402e3c7b3cef815b6328111a18 100644
--- a/data/json/SummoningDefinition/506.json
+++ b/data/json/SummoningDefinition/506.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 25
         }
       ],
       "hasEffects": true,
@@ -29,7 +25,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -42,25 +38,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +72,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Craquasseur",
   "m_availability": 2,
   "m_i18nNameId": 90959,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 99984,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/507.json b/data/json/SummoningDefinition/507.json
index ade4c9a19ec3c35b061bb6960b78a38762c23072..72729f89490024b315accc48e20b53a1b98b6a28 100644
--- a/data/json/SummoningDefinition/507.json
+++ b/data/json/SummoningDefinition/507.json
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 12
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "OSAMODAS - BETE - Jeune Craqueleur",
   "m_availability": 3,
   "m_i18nNameId": 99571,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 59028,
   "assetGuid": "7e269eb33a210d14f99428545075d20c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/509.json b/data/json/SummoningDefinition/509.json
index 00e33041cae34e7ed383377d9ced5771d458afc7..1d757b3c33ac18d9269937e022258e3ffe5eb2ef 100644
--- a/data/json/SummoningDefinition/509.json
+++ b/data/json/SummoningDefinition/509.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 25
         }
       ],
       "hasEffects": true,
@@ -34,7 +30,7 @@
       61
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 91.0,
       "factor": {
@@ -47,25 +43,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -73,6 +77,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Dégénéré",
   "m_availability": 2,
   "m_i18nNameId": 62296,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 27018,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/510.json b/data/json/SummoningDefinition/510.json
index 0ec08e0643a4b804540cc720742d13ecab23b8c5..18fbd06a490c0bddedb3371aacdd03d82cf4db94 100644
--- a/data/json/SummoningDefinition/510.json
+++ b/data/json/SummoningDefinition/510.json
@@ -14,6 +14,7 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
+        "PUSH",
         "FLOOR",
         {
           "type": 6,
@@ -25,7 +26,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 85.0,
       "factor": {
@@ -38,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +73,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Pichon Sorcier",
   "m_availability": 2,
   "m_i18nNameId": 15805,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 79539,
   "assetGuid": "40e3bd7c67dc8dc48b8c72ea06ce6d42"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/511.json b/data/json/SummoningDefinition/511.json
index aae0275a57ce809f8343dbd5af9ef291a9d23853..d3e688781cfee17e7f64aa682182479d5af86ee4 100644
--- a/data/json/SummoningDefinition/511.json
+++ b/data/json/SummoningDefinition/511.json
@@ -7,35 +7,39 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2343,
+    "defaultSkin": 6463,
     "skins": [
-      2343
+      6463
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "ex",
-          "baseValue": 11.0,
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "dmgM",
+          "baseValue": 12.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "EXPLOSION"
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        }
       ]
     },
     "families": [
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 92.0,
+      "baseValue": 77.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -46,32 +50,41 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-      "referenceId": "",
-      "baseValue": 16.0,
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
+      "referenceId": "dmgM",
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Dompteur Ardent",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Larbin monté Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 93789,
+  "m_i18nChampionNameId": 91399,
   "m_i18nDescriptionId": 10500,
-  "assetGuid": ""
+  "assetGuid": "cff4e724c78f551418759290af1d42e2"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/515.json b/data/json/SummoningDefinition/515.json
index 6b922852619ddd973fd56cf213df6ccac61d22cb..fc62140f85ea62b3ad02db80991a88380ea54bdf 100644
--- a/data/json/SummoningDefinition/515.json
+++ b/data/json/SummoningDefinition/515.json
@@ -15,15 +15,21 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "FROZEN",
+        {
+          "type": 6,
+          "id": 1400
+        }
+      ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 81.0,
+      "baseValue": 68.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,32 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 13.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Gnokoss",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Proctoss Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 1788,
+  "m_i18nChampionNameId": 86608,
   "m_i18nDescriptionId": 60577,
   "assetGuid": "c8e48ee0245256f49a82e677e0acabfd"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/525.json b/data/json/SummoningDefinition/525.json
index 5a78e6522d3c2cdbb631fee111df4a823ade2ddf..2a9862c1ad3cb17e1a65f5fe82652ff594449890 100644
--- a/data/json/SummoningDefinition/525.json
+++ b/data/json/SummoningDefinition/525.json
@@ -21,7 +21,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 95.0,
       "factor": {
@@ -34,18 +34,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
@@ -53,6 +43,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - Striky",
   "m_availability": 2,
   "m_i18nNameId": 57288,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 54810,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/526.json b/data/json/SummoningDefinition/526.json
index 74b5d6228d58d59eb6695e034170df9a781bf052..c37c6f898fae9c717f5a9604e94634a454d20987 100644
--- a/data/json/SummoningDefinition/526.json
+++ b/data/json/SummoningDefinition/526.json
@@ -21,7 +21,9 @@
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       36
@@ -37,22 +39,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": 1.3
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +70,7 @@
   "m_displayName": "MONSTRE BOUFTOU - [NOT USED] Bouftou de Combat",
   "m_availability": 0,
   "m_i18nNameId": 80925,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 66450,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/535.json b/data/json/SummoningDefinition/535.json
index ca6943f9d7009d19d97fe4645b5439f22b98b543..8bc0ae7b58d08e9193c6af2d828aab217c606bb9 100644
--- a/data/json/SummoningDefinition/535.json
+++ b/data/json/SummoningDefinition/535.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 6
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 28
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Champion Tofu",
   "m_availability": 3,
   "m_i18nNameId": 34555,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 55234,
   "assetGuid": "fd55ae78a24ceed4d81c45103cd16cb4"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/537.json b/data/json/SummoningDefinition/537.json
index 1b1d3d380b9fb591248e2685ed6e28b772eb5b38..b5890438d71c64ff253bb856678d61e4ef1792a8 100644
--- a/data/json/SummoningDefinition/537.json
+++ b/data/json/SummoningDefinition/537.json
@@ -32,7 +32,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +90,7 @@
   "m_displayName": "GEMME - Serviteur Nécromique",
   "m_availability": 3,
   "m_i18nNameId": 35323,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 32699,
   "assetGuid": "0a7ccd2456427cb46b4e2d57fbb0c890"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/538.json b/data/json/SummoningDefinition/538.json
index 315200d3e0c2aa7b4034b5f3c5bb03e2fa476be3..b81b9ef10ddb6827e98e3bc098275df1cb4d0199 100644
--- a/data/json/SummoningDefinition/538.json
+++ b/data/json/SummoningDefinition/538.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 20.0,
           "factor": {
@@ -36,7 +36,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -49,25 +49,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -75,6 +83,7 @@
   "m_displayName": "MONSTRE COCHON - GARDIEN - Maître de l\u0027Illusion (Double)",
   "m_availability": 2,
   "m_i18nNameId": 91743,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 30707,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/543.json b/data/json/SummoningDefinition/543.json
index e696a4879a89d34d65494af3b539db0282edb80e..e99342db10b7584d4c78a57aafd794c0b56cce96 100644
--- a/data/json/SummoningDefinition/543.json
+++ b/data/json/SummoningDefinition/543.json
@@ -25,7 +25,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 90.0,
       "factor": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Tofu Enragé",
   "m_availability": 2,
   "m_i18nNameId": 21202,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 2241,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/546.json b/data/json/SummoningDefinition/546.json
index 8b26730e21292768dd6094ca385adcae97979310..13e71db8699f98a0ede02d10b98d49258454be43 100644
--- a/data/json/SummoningDefinition/546.json
+++ b/data/json/SummoningDefinition/546.json
@@ -37,21 +37,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -59,6 +67,7 @@
   "m_displayName": "OSAMODAS - BETE - Champion Flaqueux ",
   "m_availability": 3,
   "m_i18nNameId": 51131,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 29596,
   "assetGuid": "16b167d839adea74cb0ed51a169b48ad"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/550.json b/data/json/SummoningDefinition/550.json
index a7a0103bcc0bcf3e76e0fc22b6ddb9fcb5afcf8e..d1018adfc63c1d8ac392072177b72a354524463f 100644
--- a/data/json/SummoningDefinition/550.json
+++ b/data/json/SummoningDefinition/550.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 10",
   "m_availability": 2,
   "m_i18nNameId": 62799,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 69678,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/551.json b/data/json/SummoningDefinition/551.json
index 700df918a236dfb3f77ae5626ac22d0ce6d71e5f..01080253bc5ab2260f1fe518ba728ae97e5e2844 100644
--- a/data/json/SummoningDefinition/551.json
+++ b/data/json/SummoningDefinition/551.json
@@ -22,7 +22,7 @@
       60
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 80.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE GELEE - Gelée Citron",
   "m_availability": 2,
   "m_i18nNameId": 17129,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 56505,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/552.json b/data/json/SummoningDefinition/552.json
index 9f85215041e775e6e19d678b5b8d4a1b3888623c..9c551bc715f9d3b26b527436274331e3a4aa24fc 100644
--- a/data/json/SummoningDefinition/552.json
+++ b/data/json/SummoningDefinition/552.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.0,
           "factor": {
@@ -31,7 +31,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 212.0,
       "factor": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +78,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Chevalier Noir Monté",
   "m_availability": 2,
   "m_i18nNameId": 36275,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 57043,
   "assetGuid": "ec6d0afc6b300dc4a9d99a9174dc523e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/556.json b/data/json/SummoningDefinition/556.json
index 5802910952ac104db8d599ecebda8259ec69315b..3a6ea17dfabb0a97b4c581fc84e3e8a73de55b7e 100644
--- a/data/json/SummoningDefinition/556.json
+++ b/data/json/SummoningDefinition/556.json
@@ -23,7 +23,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +70,7 @@
   "m_displayName": "MONSTRE CHAFER - Crâne",
   "m_availability": 3,
   "m_i18nNameId": 80853,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 32072,
   "assetGuid": "4ae23a495c92de3468455456c5ae705b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/557.json b/data/json/SummoningDefinition/557.json
index 3e17f380fb674e5bc4516e7db947dbaadf2c84ef..78386f714c68c5454051bc515a6ac0e322e9b13a 100644
--- a/data/json/SummoningDefinition/557.json
+++ b/data/json/SummoningDefinition/557.json
@@ -31,16 +31,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -48,6 +56,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Oeuf Marron",
   "m_availability": 2,
   "m_i18nNameId": 12629,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 28930,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/558.json b/data/json/SummoningDefinition/558.json
index 3e8ee8a2c523095a666e6416d5f8b837f5ddc9c8..025d11aae8629fcdac9dd03f759a3e8fc987aa79 100644
--- a/data/json/SummoningDefinition/558.json
+++ b/data/json/SummoningDefinition/558.json
@@ -19,7 +19,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 77.0,
       "factor": {
@@ -32,25 +32,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Chapeau Méduse",
   "m_availability": 2,
   "m_i18nNameId": 87812,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 30372,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/56.json b/data/json/SummoningDefinition/56.json
index 08180826d2387ec4b159e4cf3400087a2bd5bfd1..39338f4b7ce71c7957104329f19acdb5eadb2a5e 100644
--- a/data/json/SummoningDefinition/56.json
+++ b/data/json/SummoningDefinition/56.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "h",
           "baseValue": 10.0,
           "factor": {
@@ -24,13 +24,9 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 20
         },
         {
           "type": "ConstIntegerValue",
@@ -45,9 +41,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 198.0,
+      "baseValue": 188.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -58,25 +54,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -84,6 +96,7 @@
   "m_displayName": "MONSTRE CHAFER - Pinspoteur",
   "m_availability": 3,
   "m_i18nNameId": 57974,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 47994,
   "assetGuid": "dbb03970bc802bc4883602eaff1902af"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/566.json b/data/json/SummoningDefinition/566.json
index 45d35b72ff94eacc6204bcf76105425a1222b532..26353c9f914db6e5eca6063178e040a1a72340cd 100644
--- a/data/json/SummoningDefinition/566.json
+++ b/data/json/SummoningDefinition/566.json
@@ -24,7 +24,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 96.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +71,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Fantassins 3 (Or)",
   "m_availability": 2,
   "m_i18nNameId": 93154,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 36726,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/567.json b/data/json/SummoningDefinition/567.json
index 50652e8aca156014613c5fafd661ff8fd54304c3..becae36ffce6bb740fd09d2d0a9de955c73481c9 100644
--- a/data/json/SummoningDefinition/567.json
+++ b/data/json/SummoningDefinition/567.json
@@ -24,7 +24,7 @@
       61
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 101.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +71,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Dégénérescence",
   "m_availability": 2,
   "m_i18nNameId": 48178,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 10192,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/568.json b/data/json/SummoningDefinition/568.json
index a03282ff53622fdb6389f6b1b829cb35879ee2ec..051236c43805ba0f904ef9fad3c173c2482c0010 100644
--- a/data/json/SummoningDefinition/568.json
+++ b/data/json/SummoningDefinition/568.json
@@ -7,13 +7,29 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2944,
+    "defaultSkin": 1243,
     "skins": [
-      2944
+      1243
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "atAOE",
+          "value": 25
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 2
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "atself",
+          "value": 50
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "FLOOR",
@@ -27,9 +43,9 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 99.0,
+      "baseValue": 84.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -40,32 +56,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 22.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Buveur de Lave",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Bworkakorn Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 52102,
+  "m_i18nChampionNameId": 87569,
   "m_i18nDescriptionId": 70166,
-  "assetGuid": ""
+  "assetGuid": "4ee8f424a88b02b42acfd5694c5aa0f6"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/57.json b/data/json/SummoningDefinition/57.json
index 590282dee3b5a0109b02ed557af897cea0a94f97..1c2350e3f8c2ecc5ef8b2935d3996d1aeb18cb4f 100644
--- a/data/json/SummoningDefinition/57.json
+++ b/data/json/SummoningDefinition/57.json
@@ -15,7 +15,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "AT",
-          "value": 8
+          "value": 50
         }
       ],
       "hasEffects": true,
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 16
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "MONSTRE RAT - Rat Justé",
   "m_availability": 2,
   "m_i18nNameId": 94256,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 36257,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/574.json b/data/json/SummoningDefinition/574.json
index 5b22b7804f8202fba19ea887e2788644b85721ed..3f6958a97b38086a5fb5c54c64cb65b3bc431572 100644
--- a/data/json/SummoningDefinition/574.json
+++ b/data/json/SummoningDefinition/574.json
@@ -13,7 +13,26 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "att",
+          "baseValue": 9.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "ar",
+          "baseValue": 18.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": []
     },
@@ -21,7 +40,7 @@
       50
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 225.0,
       "factor": {
@@ -34,25 +53,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +87,7 @@
   "m_displayName": "MONSTRE COCHON - Chevalier de Parme",
   "m_availability": 3,
   "m_i18nNameId": 36047,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 63013,
   "assetGuid": "ba93639dd13709a429822460b2da4cf8"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/58.json b/data/json/SummoningDefinition/58.json
index 2bb343867038ff2f65b2401bb21c19169142e3bf..471c07698233662de4f2b897bcfd3f5b9d889d29 100644
--- a/data/json/SummoningDefinition/58.json
+++ b/data/json/SummoningDefinition/58.json
@@ -37,21 +37,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -59,6 +67,7 @@
   "m_displayName": "MONSTRE TOFU - Tof\u0027Argent",
   "m_availability": 2,
   "m_i18nNameId": 10664,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 71007,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/587.json b/data/json/SummoningDefinition/587.json
index e43828b82d5038df77764d1fe92666d9941121e4..584523bdeba6ce03e95c2490b8ecbfa9890cfcf4 100644
--- a/data/json/SummoningDefinition/587.json
+++ b/data/json/SummoningDefinition/587.json
@@ -13,7 +13,13 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "a",
+          "value": 1
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
@@ -25,9 +31,9 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 94.0,
+      "baseValue": 101.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -38,45 +44,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
-    "actionType": 1,
-    "actionRange": {
-      "type": "ActionRange",
-      "min": {
-        "type": "ConstIntegerValue",
-        "referenceId": "",
-        "value": 1
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
       },
-      "max": {
-        "type": "ConstIntegerValue",
-        "referenceId": "",
-        "value": 3
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
       }
-    },
+    ],
+    "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Maki Gengrouisai",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Mortadella Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 77217,
+  "m_i18nChampionNameId": 89613,
   "m_i18nDescriptionId": 16444,
   "assetGuid": "f6625c259063f644cbff07923c0cac63"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/591.json b/data/json/SummoningDefinition/591.json
index 79fea5011760e0571e93546ccf641123442139c8..49ea6748f67f8739590b050f0b757bb35f055823 100644
--- a/data/json/SummoningDefinition/591.json
+++ b/data/json/SummoningDefinition/591.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 5
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 21
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Chef Tofu",
   "m_availability": 3,
   "m_i18nNameId": 54042,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 74495,
   "assetGuid": "ca3372a2caa3aa04eb43980339af66df"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/594.json b/data/json/SummoningDefinition/594.json
index 47b181c49c240fb6329dfbccf66e929ea7f24c00..5f391fe98387d49c22142d148c46ae83f66ca046 100644
--- a/data/json/SummoningDefinition/594.json
+++ b/data/json/SummoningDefinition/594.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 20.0,
           "factor": {
@@ -36,7 +36,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -49,25 +49,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -75,6 +83,7 @@
   "m_displayName": "MONSTRE COCHON - GARDIEN - Maître de l\u0027Illusion",
   "m_availability": 2,
   "m_i18nNameId": 21852,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 16691,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/595.json b/data/json/SummoningDefinition/595.json
index dc783f69bcc0c0c14a57714d0f104d9ff1465c0e..5856d7a10aee8a843d8ce475eb3f62b509a54208 100644
--- a/data/json/SummoningDefinition/595.json
+++ b/data/json/SummoningDefinition/595.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 14
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Bébé Prespic",
   "m_availability": 3,
   "m_i18nNameId": 29160,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 78388,
   "assetGuid": "b659d04b6b321424a8e63bf13c3dca6f"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/597.json b/data/json/SummoningDefinition/597.json
index 83ac62170c2f24d2ab4c68ff95aad92d9f7e0027..9cc1f2a9bfce2205c6099e2c236df80e331d64be 100644
--- a/data/json/SummoningDefinition/597.json
+++ b/data/json/SummoningDefinition/597.json
@@ -29,22 +29,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.2,
       "factor": 1.8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Dragon Blanc",
   "m_availability": 2,
   "m_i18nNameId": 6415,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 44124,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/598.json b/data/json/SummoningDefinition/598.json
index 65e76eaa06d2e44631b7c1ab79b557cbb7d6ee0c..7ff6339d44b69290033ea489b753af0b976456f9 100644
--- a/data/json/SummoningDefinition/598.json
+++ b/data/json/SummoningDefinition/598.json
@@ -21,7 +21,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -34,18 +34,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
@@ -53,6 +43,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - Jersey",
   "m_availability": 2,
   "m_i18nNameId": 73286,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 76575,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/60.json b/data/json/SummoningDefinition/60.json
index 41e8374ffdbbc6b50e0eef4c6d90802fdbe1a1ce..4c20b5dd938c6e837b161ee9a3edc497cc83d906 100644
--- a/data/json/SummoningDefinition/60.json
+++ b/data/json/SummoningDefinition/60.json
@@ -24,7 +24,7 @@
       61
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 81.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +71,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Bouftounu",
   "m_availability": 2,
   "m_i18nNameId": 43325,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 43287,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/600.json b/data/json/SummoningDefinition/600.json
index 0808ef7b2d236bab3db3642c4af859a24a038a4b..dedf0b1f13c08fc02ba305f163ac29c0a6791da0 100644
--- a/data/json/SummoningDefinition/600.json
+++ b/data/json/SummoningDefinition/600.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": 0.4
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE BOUFTOU - [NOT USED] Pustule de Dégénerescence",
   "m_availability": 0,
   "m_i18nNameId": 13525,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 77977,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/603.json b/data/json/SummoningDefinition/603.json
index 525333967969eed76dfff93c5b884971ba663d69..d5e7f872f25afa090834c0ed42a0bde71bae708b 100644
--- a/data/json/SummoningDefinition/603.json
+++ b/data/json/SummoningDefinition/603.json
@@ -13,12 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "mult",
           "baseValue": 3.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -31,7 +31,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 105.0,
       "factor": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +78,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Espadon",
   "m_availability": 2,
   "m_i18nNameId": 92289,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 78469,
   "assetGuid": "53059fd0c2baebc4eac756fc17a91ad0"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/605.json b/data/json/SummoningDefinition/605.json
index 3d423a80ee8216daeaeda642f61550f698ad39fc..12a7d229a2e080335b54fda9bb8e9b09f0550b3b 100644
--- a/data/json/SummoningDefinition/605.json
+++ b/data/json/SummoningDefinition/605.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 390.0,
           "factor": {
@@ -22,7 +22,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar1",
           "baseValue": 260.0,
           "factor": {
@@ -31,16 +31,12 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 20.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 80
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar2",
           "baseValue": 130.0,
           "factor": {
@@ -59,7 +55,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
@@ -72,25 +68,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -98,6 +102,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Forteresse Royale V2",
   "m_availability": 2,
   "m_i18nNameId": 60241,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 8487,
   "assetGuid": "7e9760e42c26fad4cb21303fcf6bb783"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/607.json b/data/json/SummoningDefinition/607.json
index b78a478c1f611972b878041ae79c4e36b4f13392..65d16d4de830d7963245a14d00224761a19cfca9 100644
--- a/data/json/SummoningDefinition/607.json
+++ b/data/json/SummoningDefinition/607.json
@@ -7,15 +7,23 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 6245,
-    "skins": [],
+    "defaultSkin": 8142,
+    "skins": [
+      8142
+    ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pm",
+          "value": 1
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "PADMAAURA",
-        "FRACTURED",
+        "AURA",
         "DIRTY"
       ]
     },
@@ -24,7 +32,7 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -37,32 +45,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - GARDIEN - Brise-Crâne",
+  "m_displayName": "MONSTRE COCHON - GARDIEN - Jamon le Sanguinaire",
   "m_availability": 2,
   "m_i18nNameId": 47931,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 8369,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/609.json b/data/json/SummoningDefinition/609.json
index 897b19404fd222f33b1b5a9348950d7cad4aadd3..b2c923670447d0ae3a2075f050a6e5a7f32588bc 100644
--- a/data/json/SummoningDefinition/609.json
+++ b/data/json/SummoningDefinition/609.json
@@ -13,19 +13,23 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 30
+        }
+      ],
       "hasEffects": true,
-      "keywordReferences": [
-        "DEATHBLOW"
-      ]
+      "keywordReferences": []
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 95.0,
+      "baseValue": 102.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -36,25 +40,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 18.0,
+      "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -72,9 +84,10 @@
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - San Toku",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Crogneur Surin",
+  "m_availability": 3,
   "m_i18nNameId": 580,
+  "m_i18nChampionNameId": 60032,
   "m_i18nDescriptionId": 85554,
   "assetGuid": "da900dba6425821428fe6ad10ace67f7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/61.json b/data/json/SummoningDefinition/61.json
index b3ef2112d7d15acf6023a165501291eed379e3ab..094f5d992bafcc283df66902069bad93a1801f81 100644
--- a/data/json/SummoningDefinition/61.json
+++ b/data/json/SummoningDefinition/61.json
@@ -15,15 +15,17 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "UNTARGETABLE"
+      ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 85.0,
+      "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,32 +36,57 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 150
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 28.0,
+      "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 150
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 150
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Hocho la Dépeceuse",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Châtreuse Surin",
+  "m_availability": 3,
   "m_i18nNameId": 39343,
+  "m_i18nChampionNameId": 15619,
   "m_i18nDescriptionId": 96913,
   "assetGuid": "a6cbd61e8d1914f4da251b418279cb1f"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/610.json b/data/json/SummoningDefinition/610.json
index 904a3c3ef8fd7a1480e28be33c37b02f0763974f..9a95907ce4a12a07b270e7bc02ae4d9373710862 100644
--- a/data/json/SummoningDefinition/610.json
+++ b/data/json/SummoningDefinition/610.json
@@ -7,26 +7,35 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 1853,
     "skins": [
-      1
+      1853
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "ConstIntegerValue",
-          "referenceId": "life",
-          "value": 50
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pm",
-          "value": 2
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "ar",
+          "baseValue": 10.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        "EXALTED",
+        {
+          "type": 25,
+          "id": 589
+        },
         "ANGRYDRIVE"
       ]
     },
@@ -35,9 +44,9 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 196.0,
+      "baseValue": 191.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -46,40 +55,56 @@
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 2
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
+      "value": 3
     },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
-    "actionType": 1,
-    "spells": [
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
       {
-        "type": "SpellOnSpawnWithDestination",
-        "spell": 123,
-        "destination": 4
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
       }
     ],
+    "actionType": 1,
+    "actionRange": {
+      "type": "ActionRange",
+      "min": {
+        "type": "ConstIntegerValue",
+        "referenceId": "",
+        "value": 1
+      },
+      "max": {
+        "type": "ConstIntegerValue",
+        "referenceId": "",
+        "value": 2
+      }
+    },
+    "spells": [],
     "cost": []
   },
   "m_displayName": "MONSTRE BWORK - GARDIEN - Gurs le Bworzerker",
   "m_availability": 2,
   "m_i18nNameId": 2874,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 99042,
-  "assetGuid": ""
+  "assetGuid": "0ba4a2b060ee7974d96082d4208fde1a"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/613.json b/data/json/SummoningDefinition/613.json
index 807bbadb14dcb1430dc5e758eb9a39653d87b72e..af14058497fd23c89f9996ad97dddcb5af5b84ef 100644
--- a/data/json/SummoningDefinition/613.json
+++ b/data/json/SummoningDefinition/613.json
@@ -7,26 +7,35 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2322,
+    "defaultSkin": 2207,
     "skins": [
-      2322
+      2207
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "dmgP",
+          "value": 10
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
-        "ANGRYDRIVE"
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        }
       ]
     },
     "families": [
-      49,
-      63
+      49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 98.0,
+      "baseValue": 71.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -37,32 +46,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 17.0,
+      "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Boomer",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Larbin Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 65410,
+  "m_i18nChampionNameId": 63711,
   "m_i18nDescriptionId": 75473,
-  "assetGuid": ""
+  "assetGuid": "5c9d6e826b35bfd42a369749b63306d6"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/614.json b/data/json/SummoningDefinition/614.json
index 66339fa7f5c73f71ec721337173b2899281f365c..ac305ee1c28520a616af0939ce0ad8682e5cc7a2 100644
--- a/data/json/SummoningDefinition/614.json
+++ b/data/json/SummoningDefinition/614.json
@@ -21,7 +21,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -34,25 +34,41 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 28.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +76,7 @@
   "m_displayName": "MONSTRE CHAFER - Patriarche Suprême",
   "m_availability": 3,
   "m_i18nNameId": 87485,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 4566,
   "assetGuid": "919574b940f646049ad9a69619c37205"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/617.json b/data/json/SummoningDefinition/617.json
index a12dd8b22d7171c5be86b7e3a3c99ae174ef5d0b..7810910a6cd16acdddf9e4823e63f21d054e7877 100644
--- a/data/json/SummoningDefinition/617.json
+++ b/data/json/SummoningDefinition/617.json
@@ -30,7 +30,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 78.0,
       "factor": {
@@ -43,18 +43,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
@@ -62,6 +52,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +77,7 @@
   "m_displayName": "MONSTRE TAURE - Pubertaure",
   "m_availability": 2,
   "m_i18nNameId": 77854,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 32527,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/620.json b/data/json/SummoningDefinition/620.json
index c82604fd58c1bee6dd6bcf6f1c1ed5d435cc1088..abab544e64a64221966af2d53898d5e8e1a1f964 100644
--- a/data/json/SummoningDefinition/620.json
+++ b/data/json/SummoningDefinition/620.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 06",
   "m_availability": 2,
   "m_i18nNameId": 13471,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 76311,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/621.json b/data/json/SummoningDefinition/621.json
index 0f3d0290ce81f57cbece8ad74f020ad2d723fa67..35bb8bc81089dabc0d0dfa5eeaca797dd90a0cbc 100644
--- a/data/json/SummoningDefinition/621.json
+++ b/data/json/SummoningDefinition/621.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 4.5,
       "factor": 0.5
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Larve Toxique",
   "m_availability": 2,
   "m_i18nNameId": 59077,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 13604,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/622.json b/data/json/SummoningDefinition/622.json
index cb645c4c003bfecad813d4fc71177136da41ee29..3a067c8cd6a35bface1e57ab545a82f763d265b9 100644
--- a/data/json/SummoningDefinition/622.json
+++ b/data/json/SummoningDefinition/622.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Swamp Thing",
   "m_availability": 2,
   "m_i18nNameId": 39546,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 84298,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/626.json b/data/json/SummoningDefinition/626.json
index 07033aef813568c0b5a144d3c8f8fb33b43ea5cd..4c32c75843e98679b4de7150d0da0efdc28a0d38 100644
--- a/data/json/SummoningDefinition/626.json
+++ b/data/json/SummoningDefinition/626.json
@@ -35,22 +35,30 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": 2.0
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Abrak\u0027Nid Putréfié",
   "m_availability": 2,
   "m_i18nNameId": 87294,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 96754,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/630.json b/data/json/SummoningDefinition/630.json
index 533cb7ac608bb9b84a966fccea42df7f0710704d..150662de459d06f2e5c5278d2077a5e1b276f516 100644
--- a/data/json/SummoningDefinition/630.json
+++ b/data/json/SummoningDefinition/630.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 40
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE PICHON - Gar garo dent",
   "m_availability": 2,
   "m_i18nNameId": 40364,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 8503,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/635.json b/data/json/SummoningDefinition/635.json
index e1bbf3a9b84c573cc5ba2786638edf9ea4f18de4..6621aeb30060c3161f88211f488497f79294683f 100644
--- a/data/json/SummoningDefinition/635.json
+++ b/data/json/SummoningDefinition/635.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 19
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Spadon",
   "m_availability": 2,
   "m_i18nNameId": 47399,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 82069,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/638.json b/data/json/SummoningDefinition/638.json
index d4dd20dc041a13c8f02a2a6ee03affbcc7e7a353..9a03a94370ae28ada7f37506be36565c41c0c23a 100644
--- a/data/json/SummoningDefinition/638.json
+++ b/data/json/SummoningDefinition/638.json
@@ -13,16 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 10.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 70
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.0,
           "factor": {
@@ -38,7 +34,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 150.0,
       "factor": {
@@ -51,25 +47,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -77,6 +81,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Tour Craquelée",
   "m_availability": 2,
   "m_i18nNameId": 33222,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 22861,
   "assetGuid": "6c4709d6c54a79c4bb9b450f3c07bee7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/64.json b/data/json/SummoningDefinition/64.json
index bfd593f0c7af90e75ae8df52293c4480e39eb0dd..eda1b37a7efd3631595f999c12ec536f943375e8 100644
--- a/data/json/SummoningDefinition/64.json
+++ b/data/json/SummoningDefinition/64.json
@@ -21,7 +21,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 85.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Murène Électrique",
   "m_availability": 2,
   "m_i18nNameId": 91055,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 65183,
   "assetGuid": "49655fb6117b6554a9093cd897eeb3f1"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/644.json b/data/json/SummoningDefinition/644.json
index 950eacba675da71794bf0363764aa4b880c63afd..70a3714dada2f82ff603ea51a371dcd6b5fc2b7b 100644
--- a/data/json/SummoningDefinition/644.json
+++ b/data/json/SummoningDefinition/644.json
@@ -14,16 +14,10 @@
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
-        {
-          "type": 4,
-          "id": 941
-        },
-        {
-          "type": 25,
-          "id": 65351
-        }
+        "SHADOW",
+        "UNIQUE"
       ]
     },
     "families": [
@@ -35,7 +29,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -43,21 +37,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "ConstIntegerValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "value": 0
+      "baseValue": 10.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 9
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -65,6 +87,7 @@
   "m_displayName": "IOP - Âme Corrompue",
   "m_availability": 3,
   "m_i18nNameId": 73945,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 31135,
   "assetGuid": "34aeaf39bfca4d84f91c998a5a86b144"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/657.json b/data/json/SummoningDefinition/657.json
index 403aef9ebf89372d0fac25dfeac37d7676ec10b5..e81d12f6d0b70349aa4936c8894c7ceb23674bfc 100644
--- a/data/json/SummoningDefinition/657.json
+++ b/data/json/SummoningDefinition/657.json
@@ -23,7 +23,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 97.0,
       "factor": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "customActionTarget": {
       "type": "FilteredCharacterSelector",
       "filters": [
@@ -91,6 +99,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Conjurateurs Chuchoteurs",
   "m_availability": 2,
   "m_i18nNameId": 54413,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 16020,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/660.json b/data/json/SummoningDefinition/660.json
index c238102454d1935d6e96c3d9493f8c72bd49ef75..7f126258edb6161c4e1b9b1d3ed7dd087e5ee421 100644
--- a/data/json/SummoningDefinition/660.json
+++ b/data/json/SummoningDefinition/660.json
@@ -29,22 +29,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 21.6,
       "factor": 2.4
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Boss Dragoeuf",
   "m_availability": 2,
   "m_i18nNameId": 14722,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 28264,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/661.json b/data/json/SummoningDefinition/661.json
index b060b3a6e3b9a23fc8cbdaae589de8fc63008fc1..aacf2f174f743624285497865654897c790897d5 100644
--- a/data/json/SummoningDefinition/661.json
+++ b/data/json/SummoningDefinition/661.json
@@ -50,16 +50,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -76,6 +66,24 @@
         28
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -83,6 +91,7 @@
   "m_displayName": "SRAM - Ombre Huilée",
   "m_availability": 2,
   "m_i18nNameId": 41585,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 6019,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/662.json b/data/json/SummoningDefinition/662.json
index 2c1d95e49bbe1c540ee7c2cd4bdf52f515241105..d2181d2d569bf55706ae312755dfc4b296574317 100644
--- a/data/json/SummoningDefinition/662.json
+++ b/data/json/SummoningDefinition/662.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 13",
   "m_availability": 2,
   "m_i18nNameId": 20049,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 41829,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/663.json b/data/json/SummoningDefinition/663.json
index 7d271b8b5e4927bf5c1878121e26d62b1a05c96d..cb83247cf173ed5a19ca54c2224c1ca115a62096 100644
--- a/data/json/SummoningDefinition/663.json
+++ b/data/json/SummoningDefinition/663.json
@@ -15,22 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "atmin",
-          "baseValue": 7.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "atmax",
-          "baseValue": 12.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 50
         }
       ],
       "hasEffects": true,
@@ -40,7 +27,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 81.0,
       "factor": {
@@ -53,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -79,6 +74,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Bouftou Adulte",
   "m_availability": 2,
   "m_i18nNameId": 59140,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 96460,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/67.json b/data/json/SummoningDefinition/67.json
index 844f1a90f8f1ee95eff1f6dbec3cef9dbe2696fd..c97a9df230a630d8fbb44fe35d3c1dfc4ecb893f 100644
--- a/data/json/SummoningDefinition/67.json
+++ b/data/json/SummoningDefinition/67.json
@@ -33,7 +33,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 65.0,
       "factor": {
@@ -46,18 +46,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 7.0,
       "factor": {
@@ -65,13 +55,32 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
   "m_displayName": "MONSTRE COCHON - Nouvelle recrue",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 71787,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 40979,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/674.json b/data/json/SummoningDefinition/674.json
index d01f5bd941433cfb7631a7cee49e0fbb063101e3..f87d731acb74b0fc6a9c1054d5028e9fdb444213 100644
--- a/data/json/SummoningDefinition/674.json
+++ b/data/json/SummoningDefinition/674.json
@@ -13,12 +13,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "at",
           "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -33,7 +33,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -46,25 +46,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 11.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -72,6 +80,7 @@
   "m_displayName": "MONSTRE TOFU - Boss de donjon - Tofu Légendaire",
   "m_availability": 2,
   "m_i18nNameId": 69878,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 78109,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/677.json b/data/json/SummoningDefinition/677.json
index adbcf8f00bdd3f7da1cfa74b9a940a775597b4f8..760ba17432a45fb497b93a5ac2a8a91e16a819b4 100644
--- a/data/json/SummoningDefinition/677.json
+++ b/data/json/SummoningDefinition/677.json
@@ -25,7 +25,7 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 101.0,
       "factor": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE COCHON - Mortadella",
   "m_availability": 3,
   "m_i18nNameId": 2932,
+  "m_i18nChampionNameId": 27585,
   "m_i18nDescriptionId": 58162,
   "assetGuid": "c1c75f949a1bce14ba007eec9c3d1e83"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/679.json b/data/json/SummoningDefinition/679.json
index 0d52d83082624b49e2e4091865e130d6ecd696be..d61592557c32782e5da62c4673ac9d8ef6c8ee2d 100644
--- a/data/json/SummoningDefinition/679.json
+++ b/data/json/SummoningDefinition/679.json
@@ -34,21 +34,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 16
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -56,6 +64,7 @@
   "m_displayName": "OSAMODAS - BETE - Chef Craqueleur",
   "m_availability": 3,
   "m_i18nNameId": 35918,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 49578,
   "assetGuid": "8c915d3788fc18b47be248fc400fcca9"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/683.json b/data/json/SummoningDefinition/683.json
index 0f5f679ac5294497e2573aa33d4cdd2a65a6bb14..89007c8e0287789a48be6c10bc214ff15a4443c3 100644
--- a/data/json/SummoningDefinition/683.json
+++ b/data/json/SummoningDefinition/683.json
@@ -7,31 +7,41 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2944,
+    "defaultSkin": 1246,
     "skins": [
-      2944
+      1246
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 10
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "x",
+          "value": 10
+        },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
-          "value": 1
+          "value": 2
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "BATTERED"
+        "EXALTED"
       ]
     },
     "families": [
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 91.0,
+      "baseValue": 84.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -42,32 +52,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 22.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Boule et Bwork",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Bworkakorn Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 10717,
+  "m_i18nChampionNameId": 65418,
   "m_i18nDescriptionId": 80622,
-  "assetGuid": ""
+  "assetGuid": "ed6717f7f3ff3574684d4c08b34d1f65"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/684.json b/data/json/SummoningDefinition/684.json
index 3ea0a2b548b6d4db9288ff4fa2ae4dbdaf6fac08..88389610f02cd170941421b4cf77df34ee21e2eb 100644
--- a/data/json/SummoningDefinition/684.json
+++ b/data/json/SummoningDefinition/684.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 2.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 10
         }
       ],
       "hasEffects": true,
@@ -34,7 +30,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -47,25 +43,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -73,6 +77,7 @@
   "m_displayName": "MONSTRE COCHON - GARDIEN - Ninja",
   "m_availability": 2,
   "m_i18nNameId": 7701,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 34630,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/688.json b/data/json/SummoningDefinition/688.json
index 847bb4754e118ce039dcda4da897425c78753b01..045672bdb44eac2c00854e77cdf6acc3c4951082 100644
--- a/data/json/SummoningDefinition/688.json
+++ b/data/json/SummoningDefinition/688.json
@@ -7,18 +7,52 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2857,
+    "defaultSkin": 368,
     "skins": [
-      2857
+      368
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
+      "dynamicValueReferences": [
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "soin",
+          "baseValue": 5.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "min",
+          "baseValue": 15.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 11
+          }
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 18.4,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 11
+          }
+        }
+      ],
+      "hasEffects": true,
       "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        "EXALTED",
         {
           "type": 25,
-          "id": 309
+          "id": 589
         }
       ]
     },
@@ -26,9 +60,9 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 93.0,
+      "baseValue": 91.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -39,32 +73,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
+      "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Bwork Parle-Mer",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Bwork Parle-Lave Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 96077,
+  "m_i18nChampionNameId": 90454,
   "m_i18nDescriptionId": 64857,
-  "assetGuid": ""
+  "assetGuid": "eac5fc3c1359b594299b590929a39b6b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/691.json b/data/json/SummoningDefinition/691.json
index 00d54cf959cf2eafced453995d934f74c912145f..af718a45b48140779d2cda445da97d1beb9894ee 100644
--- a/data/json/SummoningDefinition/691.json
+++ b/data/json/SummoningDefinition/691.json
@@ -25,7 +25,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 102.0,
       "factor": {
@@ -38,18 +38,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
@@ -57,6 +47,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE TAURE - Prehistauric",
   "m_availability": 2,
   "m_i18nNameId": 32248,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 46836,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/692.json b/data/json/SummoningDefinition/692.json
index 0eb04ecbcca059e65243ee9d70f77f15df1fbfc1..1f705e7bed8b372c0ae71b2473d935e4b42b0292 100644
--- a/data/json/SummoningDefinition/692.json
+++ b/data/json/SummoningDefinition/692.json
@@ -17,24 +17,31 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "c1",
-          "value": 3
+          "value": 2
         },
         {
           "type": "ConstIntegerValue",
           "referenceId": "c",
-          "value": 6
+          "value": 3
+        },
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "v",
+          "value": 3
         }
       ],
-      "hasEffects": false,
-      "keywordReferences": []
+      "hasEffects": true,
+      "keywordReferences": [
+        "NECROTICBOLT"
+      ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 90.0,
+      "baseValue": 59.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -45,45 +52,54 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 28.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
       "min": {
         "type": "ConstIntegerValue",
         "referenceId": "c1",
-        "value": 3
+        "value": 2
       },
       "max": {
         "type": "ConstIntegerValue",
         "referenceId": "c",
-        "value": 6
+        "value": 3
       }
     },
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Kiro",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN SURIN - Arbatarba Surin",
+  "m_availability": 3,
   "m_i18nNameId": 5643,
+  "m_i18nChampionNameId": 59394,
   "m_i18nDescriptionId": 87829,
   "assetGuid": "1295eecd669ffb5419b9573f87f44edf"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/696.json b/data/json/SummoningDefinition/696.json
index d54b04b5221adc16650ad66428c5c9dcb9625178..13e6dee699150a88c1f40a27453e9e4ce9b88179 100644
--- a/data/json/SummoningDefinition/696.json
+++ b/data/json/SummoningDefinition/696.json
@@ -29,21 +29,29 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 32
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -51,6 +59,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Spadon ++",
   "m_availability": 2,
   "m_i18nNameId": 79434,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 8563,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/697.json b/data/json/SummoningDefinition/697.json
index 412ae51e89127bb8c54456e6d0ca5d7556f0523e..0c2cb5bd17c163fd9d658c8421eeb02b8f7c8be8 100644
--- a/data/json/SummoningDefinition/697.json
+++ b/data/json/SummoningDefinition/697.json
@@ -7,24 +7,25 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 10,
-    "skins": [],
+    "defaultSkin": 138,
+    "skins": [
+      138
+    ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 5.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "ar",
+          "value": 20
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
+        "AURA",
+        "BOUNCE",
+        "CRITICAL",
         "PORSHIDO"
       ]
     },
@@ -33,7 +34,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 200.0,
       "factor": {
@@ -46,32 +47,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - GARDIEN - Samouraï",
+  "m_displayName": "MONSTRE COCHON - GARDIEN - Jamon le Shihan",
   "m_availability": 2,
   "m_i18nNameId": 94212,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 44464,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/701.json b/data/json/SummoningDefinition/701.json
index 542cb0defe3009d76c7fe0d1b63493c04b20e4f0..3b84fb0149d277a1cfa6004ff1a0749bd325a94b 100644
--- a/data/json/SummoningDefinition/701.json
+++ b/data/json/SummoningDefinition/701.json
@@ -23,7 +23,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 54.0,
       "factor": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +70,7 @@
   "m_displayName": "MONSTRE CHAFER - Crâne Roi",
   "m_availability": 3,
   "m_i18nNameId": 35238,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 90122,
   "assetGuid": "c21444a113f78b14f9ab37238e4c4e5d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/703.json b/data/json/SummoningDefinition/703.json
index fefad7414369a3b64cdfb8bb2d0833ed8373f14f..6d298cddf3ab51e47bfc833d99df59f886bae4e9 100644
--- a/data/json/SummoningDefinition/703.json
+++ b/data/json/SummoningDefinition/703.json
@@ -22,7 +22,7 @@
       60
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 80.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE GELEE - Gelée Fraise",
   "m_availability": 2,
   "m_i18nNameId": 10308,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 87960,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/706.json b/data/json/SummoningDefinition/706.json
index d416bcdc73d4e435e3e944e75b6a0ae5d45ac02c..ae215b65930eddb4f0e128655c27d3ca5560f7dd 100644
--- a/data/json/SummoningDefinition/706.json
+++ b/data/json/SummoningDefinition/706.json
@@ -35,22 +35,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 11.7,
       "factor": 1.3
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Abrak\u0027 Infesté",
   "m_availability": 2,
   "m_i18nNameId": 9407,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 78315,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/711.json b/data/json/SummoningDefinition/711.json
index 9b18d604b614da12d79b5cdcedebe93c9769979e..1ea97adbcdabd2b6449fd0f455d6650abdbe1d9d 100644
--- a/data/json/SummoningDefinition/711.json
+++ b/data/json/SummoningDefinition/711.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 18
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE RAT - Rat Doter",
   "m_availability": 2,
   "m_i18nNameId": 12231,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 77544,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/715.json b/data/json/SummoningDefinition/715.json
index fcd995760dd5b5e31505fd2659fae5392d858bd2..e3f3832c69bbbb51252dc0ee1fb75e793ba0cf42 100644
--- a/data/json/SummoningDefinition/715.json
+++ b/data/json/SummoningDefinition/715.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv",
           "baseValue": 75.0,
           "factor": {
@@ -22,7 +22,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv2",
           "baseValue": 75.0,
           "factor": {
@@ -31,7 +31,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv1",
           "baseValue": 50.0,
           "factor": {
@@ -47,7 +47,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "pv",
       "baseValue": 75.0,
       "factor": {
@@ -60,25 +60,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -91,6 +99,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Moyenne Horde",
   "m_availability": 2,
   "m_i18nNameId": 43753,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 10043,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/716.json b/data/json/SummoningDefinition/716.json
index 29bac0199af3f829d294d9913a8870de72860910..9386dd96aa22463d5e1016c13bb1f35790e513a8 100644
--- a/data/json/SummoningDefinition/716.json
+++ b/data/json/SummoningDefinition/716.json
@@ -13,8 +13,14 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": true,
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 50
+        }
+      ],
+      "hasEffects": false,
       "keywordReferences": [
         "PADMAAURA",
         "DIRTY"
@@ -25,9 +31,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 91.0,
+      "baseValue": 77.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -38,32 +44,40 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
       "min": {
         "type": "ConstIntegerValue",
         "referenceId": "",
-        "value": 1
+        "value": 2
       },
       "max": {
         "type": "ConstIntegerValue",
@@ -74,9 +88,10 @@
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Pigsaw",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Soldat Tripoux Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 55009,
+  "m_i18nChampionNameId": 80174,
   "m_i18nDescriptionId": 48297,
   "assetGuid": "34ff785fab770cc42b3c44428a04bce7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/717.json b/data/json/SummoningDefinition/717.json
index d48236775fae9ce4e97af4a78824c3a2d8bde7a0..317f56fa23542bc6641839088f86981edb9e0e7d 100644
--- a/data/json/SummoningDefinition/717.json
+++ b/data/json/SummoningDefinition/717.json
@@ -22,7 +22,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 173.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 21.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Chevalier Noir",
   "m_availability": 2,
   "m_i18nNameId": 7495,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 9136,
   "assetGuid": "7cf37d7425c130342ba2b95e434bd9fb"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/720.json b/data/json/SummoningDefinition/720.json
index 290de52c9c70d0a8eb9c1b83b8a50c0a2920270b..a48d810249c1598fa730c28ef1d82f4182d34b62 100644
--- a/data/json/SummoningDefinition/720.json
+++ b/data/json/SummoningDefinition/720.json
@@ -24,7 +24,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 70.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Fantassins 1 (Bronze)",
   "m_availability": 2,
   "m_i18nNameId": 51194,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 76167,
   "assetGuid": "cb2c2e7d842460048a01bc52edefef04"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/731.json b/data/json/SummoningDefinition/731.json
index a6b8958e158887b7606c5e533c23f8082fd48224..4db222000b21d5db23ada2ee32086553d15fef1c 100644
--- a/data/json/SummoningDefinition/731.json
+++ b/data/json/SummoningDefinition/731.json
@@ -7,21 +7,17 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2322,
+    "defaultSkin": 220,
     "skins": [
-      2322
+      220
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "type": "ConstIntegerValue",
+          "referenceId": "paR",
+          "value": 1
         }
       ],
       "hasEffects": true,
@@ -31,9 +27,9 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 96.0,
+      "baseValue": 71.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -44,32 +40,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 17.0,
+      "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Mousse Ayon",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Larbin Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 44174,
+  "m_i18nChampionNameId": 49689,
   "m_i18nDescriptionId": 82274,
-  "assetGuid": ""
+  "assetGuid": "089862af5a83b6f47b6015e1db57cc72"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/74.json b/data/json/SummoningDefinition/74.json
index 42fbdeba7f549e789d687f2f7a38c8583bd5e7f5..3331b6f06df3cd4e742a551e7c27630682b42e74 100644
--- a/data/json/SummoningDefinition/74.json
+++ b/data/json/SummoningDefinition/74.json
@@ -28,7 +28,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 86.0,
       "factor": {
@@ -41,25 +41,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -67,6 +75,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Sentinelle Craquelée",
   "m_availability": 2,
   "m_i18nNameId": 77941,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 28629,
   "assetGuid": "fbcaed85f0cf1e349af7e15a3ec5051e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/748.json b/data/json/SummoningDefinition/748.json
index a86e7acce833dd95b186def777185bea8a9e9976..24c8c47a3e153d13d6d0375a0db9d0e2ce3582fb 100644
--- a/data/json/SummoningDefinition/748.json
+++ b/data/json/SummoningDefinition/748.json
@@ -22,7 +22,7 @@
       61
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 95.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Bouflépreuse",
   "m_availability": 2,
   "m_i18nNameId": 50046,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 34984,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/749.json b/data/json/SummoningDefinition/749.json
index eaaf2887d27bbef92ba7336d8f3556c557faf7d8..3476b86d293396d7b194ee451d34e6f3e548456a 100644
--- a/data/json/SummoningDefinition/749.json
+++ b/data/json/SummoningDefinition/749.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 19
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE RAT - Rat Diation",
   "m_availability": 2,
   "m_i18nNameId": 79739,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 7247,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/75.json b/data/json/SummoningDefinition/75.json
index ad29f6f9bd2cdb4c4f7fa9b332b27a561ac8aa75..51fa74759bfba918084d0f9705924b92d6561ff6 100644
--- a/data/json/SummoningDefinition/75.json
+++ b/data/json/SummoningDefinition/75.json
@@ -16,14 +16,7 @@
       "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        "FRACTURED",
-        "FLOOR",
         "PADMAAURA",
-        {
-          "type": 6,
-          "id": 1500
-        },
-        "BATSU",
         "DIRTY"
       ]
     },
@@ -32,9 +25,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 94.0,
+      "baseValue": 85.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -45,32 +38,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 15.0,
+      "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Freddy Grouiger",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Disciple Cochonnet Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 37605,
+  "m_i18nChampionNameId": 65474,
   "m_i18nDescriptionId": 96474,
   "assetGuid": "c364150b5d3eab348ad7b19528742f71"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/750.json b/data/json/SummoningDefinition/750.json
index fec400644d17a7fb7941acf5afa563d6364d40c7..c8ae804203ba1a8cf151e8309e4766c6f3c11b08 100644
--- a/data/json/SummoningDefinition/750.json
+++ b/data/json/SummoningDefinition/750.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.8,
       "factor": 1.2
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Mini Dragon Bleu",
   "m_availability": 2,
   "m_i18nNameId": 46234,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 83283,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/757.json b/data/json/SummoningDefinition/757.json
index b8b629bc4cf305d21ddc0ddde985c7617e2a29cd..75129bbd15c7dfccb83ceefba62a28ba212e4ac3 100644
--- a/data/json/SummoningDefinition/757.json
+++ b/data/json/SummoningDefinition/757.json
@@ -32,7 +32,7 @@
       "baseValue": 152.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -40,25 +40,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +90,7 @@
   "m_displayName": "GEMME - Esprit de l\u0027Eau",
   "m_availability": 3,
   "m_i18nNameId": 67193,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 52984,
   "assetGuid": "103030e22fc2b72458e70c7e232fd36d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/76.json b/data/json/SummoningDefinition/76.json
index 97da8295941b66e553aaa79f68c519244e911a0d..ac5f11e3c93c765835477e345ed89ea54bf7b2ac 100644
--- a/data/json/SummoningDefinition/76.json
+++ b/data/json/SummoningDefinition/76.json
@@ -31,7 +31,7 @@
       58
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 32.0,
       "factor": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -75,6 +83,7 @@
   "m_displayName": "MONSTRE GELEE - Gelbibi Framboise",
   "m_availability": 2,
   "m_i18nNameId": 47266,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 62426,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/760.json b/data/json/SummoningDefinition/760.json
index ee741fd1eb8959c771306910238198694e194a8b..5684b3196f4f9f48a78c51dd4c42cea8c7ebe81e 100644
--- a/data/json/SummoningDefinition/760.json
+++ b/data/json/SummoningDefinition/760.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.0,
           "factor": {
@@ -37,7 +37,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 93.0,
       "factor": {
@@ -50,25 +50,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 24.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -76,6 +84,7 @@
   "m_displayName": "MONSTRE BWORK - Bworkokak",
   "m_availability": 3,
   "m_i18nNameId": 34806,
+  "m_i18nChampionNameId": 10040,
   "m_i18nDescriptionId": 57889,
   "assetGuid": "ef91ef74475284b4ea01aceb8d34be48"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/761.json b/data/json/SummoningDefinition/761.json
index f30a4f23f311e89bfd7703d8b2de538baf13cd28..d04f75f779eeec2043a04bed1dd8928527651583 100644
--- a/data/json/SummoningDefinition/761.json
+++ b/data/json/SummoningDefinition/761.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv",
           "baseValue": 100.0,
           "factor": {
@@ -22,7 +22,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv2",
           "baseValue": 75.0,
           "factor": {
@@ -31,7 +31,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "pv1",
           "baseValue": 50.0,
           "factor": {
@@ -47,7 +47,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "pv",
       "baseValue": 100.0,
       "factor": {
@@ -60,25 +60,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -86,6 +94,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Grande Horde",
   "m_availability": 2,
   "m_i18nNameId": 46396,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 90268,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/763.json b/data/json/SummoningDefinition/763.json
index c400ce631306bd5789cd6349a0747a64de396754..d7f3d1fc5b305ab864431065cf3ba91b3362add5 100644
--- a/data/json/SummoningDefinition/763.json
+++ b/data/json/SummoningDefinition/763.json
@@ -29,22 +29,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 9.0,
       "factor": 1.0
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Tronk\u0027Nid",
   "m_availability": 2,
   "m_i18nNameId": 53759,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 50903,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/764.json b/data/json/SummoningDefinition/764.json
index f1f4b08f32b8c4f7f6ea19f5fc164ff16fa509af..63347872c1bb462b37a4e73d68275659efb57fbb 100644
--- a/data/json/SummoningDefinition/764.json
+++ b/data/json/SummoningDefinition/764.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 21
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Bob",
   "m_availability": 2,
   "m_i18nNameId": 4405,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 19938,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/766.json b/data/json/SummoningDefinition/766.json
index cf081245faca9e114ae6a13f7b1ef4aa34970333..c7f7d23b97374bbcc926cc4eefc1c19778cc9943 100644
--- a/data/json/SummoningDefinition/766.json
+++ b/data/json/SummoningDefinition/766.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 07",
   "m_availability": 2,
   "m_i18nNameId": 55007,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 34390,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/768.json b/data/json/SummoningDefinition/768.json
index 1115c41075e346bc86e815229e4b7fe1349d85d1..186536944d5e00827d2e2e99a0eb4a0f771729bf 100644
--- a/data/json/SummoningDefinition/768.json
+++ b/data/json/SummoningDefinition/768.json
@@ -19,7 +19,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -32,18 +32,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
@@ -51,6 +41,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - [Boss] Boss 3",
   "m_availability": 2,
   "m_i18nNameId": 95929,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 77552,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/770.json b/data/json/SummoningDefinition/770.json
index 5114179477fc86b486e6a2d0d6c17a85f773aff8..66a612c25ab32ace9ba7c50455720081b7c3cdbc 100644
--- a/data/json/SummoningDefinition/770.json
+++ b/data/json/SummoningDefinition/770.json
@@ -22,7 +22,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 77.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Chuchoteur Échassier",
   "m_availability": 2,
   "m_i18nNameId": 84672,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 5046,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/772.json b/data/json/SummoningDefinition/772.json
index 8a59a35da4dc3d2ea1f01a6554eb5cc7ae32f7d7..13864980967af32e7016ca3d32d84882f78642fd 100644
--- a/data/json/SummoningDefinition/772.json
+++ b/data/json/SummoningDefinition/772.json
@@ -18,6 +18,7 @@
           "type": 25,
           "id": 36461
         },
+        "PUSH",
         "ROOTED",
         "NECROSED"
       ]
@@ -26,7 +27,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 162.0,
       "factor": {
@@ -39,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -84,6 +93,7 @@
   "m_displayName": "MONSTRE CHAFER - GARDIEN - Liche Horrorthon",
   "m_availability": 2,
   "m_i18nNameId": 16910,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 12787,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/773.json b/data/json/SummoningDefinition/773.json
index 66efc9c378c9eb4ba06d0dc5584d76cb65a0771d..422a5ae28f349ba9b80a27c7ed10363cbafdb324 100644
--- a/data/json/SummoningDefinition/773.json
+++ b/data/json/SummoningDefinition/773.json
@@ -20,7 +20,7 @@
           "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 3
+            "reference": 8
           }
         }
       ],
@@ -36,7 +36,7 @@
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 5.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +78,7 @@
   "m_displayName": "ENIRIPSA - Nocturien",
   "m_availability": 3,
   "m_i18nNameId": 29565,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 91386,
   "assetGuid": "040f277bd9155b64bb1e4fc95e90d918"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/774.json b/data/json/SummoningDefinition/774.json
index edf173dcbd259ff17a75fca94399853e961568ef..9679bebd5981bdb9b8349c95a7568e90f2b0358f 100644
--- a/data/json/SummoningDefinition/774.json
+++ b/data/json/SummoningDefinition/774.json
@@ -16,14 +16,14 @@
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "dmg",
-          "value": 100
+          "referenceId": "a",
+          "value": 2
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
         "PADMAAURA",
-        "FRACTURED",
+        "DEATHBLOW",
         "DIRTY"
       ]
     },
@@ -32,9 +32,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 93.0,
+      "baseValue": 101.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -45,32 +45,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 13.0,
+      "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Grannie Wilkes",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Mortadella Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 82585,
+  "m_i18nChampionNameId": 41002,
   "m_i18nDescriptionId": 20522,
   "assetGuid": "031e582b2fac6384c99d07bd38c8ec94"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/776.json b/data/json/SummoningDefinition/776.json
index 8bcb532e0550247ec97ae9fc0b40625dfc2b122f..60cfa4c2124ef003b4b19c929858dc802bd371e1 100644
--- a/data/json/SummoningDefinition/776.json
+++ b/data/json/SummoningDefinition/776.json
@@ -30,7 +30,7 @@
       58
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 32.0,
       "factor": {
@@ -43,25 +43,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -74,6 +82,7 @@
   "m_displayName": "MONSTRE GELEE - Gelbibi Fraise",
   "m_availability": 2,
   "m_i18nNameId": 35083,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 18512,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/777.json b/data/json/SummoningDefinition/777.json
index 40fe4cd008846353675f8e9f22613a3c43a7584a..522ccfc68786a95f28ce89e0638affa78f2b4f1d 100644
--- a/data/json/SummoningDefinition/777.json
+++ b/data/json/SummoningDefinition/777.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.8,
       "factor": 1.2
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Mini Dragon Blanc",
   "m_availability": 2,
   "m_i18nNameId": 78665,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 68004,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/786.json b/data/json/SummoningDefinition/786.json
index 62975732e5ad5423badc3940e0e86f3dd25f9b6a..c3769a2da5353ad0a1a5beff4df98fe737d244b2 100644
--- a/data/json/SummoningDefinition/786.json
+++ b/data/json/SummoningDefinition/786.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "RoyalFortressAR",
           "baseValue": 300.0,
           "factor": {
@@ -22,7 +22,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar1",
           "baseValue": 200.0,
           "factor": {
@@ -31,16 +31,12 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 15.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 70
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar2",
           "baseValue": 100.0,
           "factor": {
@@ -59,7 +55,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
@@ -72,25 +68,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -98,6 +102,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Forteresse Royale",
   "m_availability": 2,
   "m_i18nNameId": 92972,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 18282,
   "assetGuid": "7e9760e42c26fad4cb21303fcf6bb783"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/790.json b/data/json/SummoningDefinition/790.json
index 63e33f7c8c31ab4397ff21985065d04efee7ce59..74629333921f2b1d923b7cb6cffc6c0633afa01a 100644
--- a/data/json/SummoningDefinition/790.json
+++ b/data/json/SummoningDefinition/790.json
@@ -24,7 +24,7 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 188.0,
       "factor": {
@@ -37,25 +37,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 24.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -69,6 +77,7 @@
   "m_displayName": "MONSTRE BWORK - GARDIEN - Ugor L\u0027Amocheur",
   "m_availability": 2,
   "m_i18nNameId": 73724,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 90464,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/794.json b/data/json/SummoningDefinition/794.json
index bf73397defb32f00a1402818bf598f345fed2d0a..2975e09180b09ebda14422491133b81e222f8e84 100644
--- a/data/json/SummoningDefinition/794.json
+++ b/data/json/SummoningDefinition/794.json
@@ -37,7 +37,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -50,25 +50,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 19.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -76,6 +92,7 @@
   "m_displayName": "MONSTRE CHAFER - Patriarche",
   "m_availability": 3,
   "m_i18nNameId": 93104,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 85009,
   "assetGuid": "919574b940f646049ad9a69619c37205"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/796.json b/data/json/SummoningDefinition/796.json
index 34ac4b6222d11101df406aa11123ca0a4df6ed64..31efc4f01959e4a3e01d4cd9cf840df1186d3da8 100644
--- a/data/json/SummoningDefinition/796.json
+++ b/data/json/SummoningDefinition/796.json
@@ -32,7 +32,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 173.0,
       "factor": {
@@ -45,25 +45,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -71,6 +79,7 @@
   "m_displayName": "MONSTRE COCHON - Impératrice Galantine en Deuil",
   "m_availability": 3,
   "m_i18nNameId": 13566,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 18884,
   "assetGuid": "f44a9b75442898c498eaf15ad71fbaaa"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/797.json b/data/json/SummoningDefinition/797.json
index 1cec4100ad8d83f5a7f7898cf010a9b1d60d4d40..b5cef22cc60cc76e84f30777cc04ecafe646a84e 100644
--- a/data/json/SummoningDefinition/797.json
+++ b/data/json/SummoningDefinition/797.json
@@ -35,22 +35,30 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 8.1,
       "factor": 0.9
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -69,6 +77,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Araknode l\u0027Indésirable",
   "m_availability": 2,
   "m_i18nNameId": 26739,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 58808,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/8.json b/data/json/SummoningDefinition/8.json
index d95e86593f1b44b895377d1a390a8d19c851fdc4..b25cb157a414227643b600526699c4bda13d6416 100644
--- a/data/json/SummoningDefinition/8.json
+++ b/data/json/SummoningDefinition/8.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 15.0,
           "factor": {
@@ -36,7 +36,7 @@
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 140.0,
       "factor": {
@@ -49,25 +49,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -75,6 +83,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Sentinelle Supérieure",
   "m_availability": 2,
   "m_i18nNameId": 20327,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 71647,
   "assetGuid": "fbcaed85f0cf1e349af7e15a3ec5051e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/801.json b/data/json/SummoningDefinition/801.json
index 9e84a9ee53cfac4829689945deeb7478494366e9..bc74774c1fe4faa93966a286769d9ec78b1d14ff 100644
--- a/data/json/SummoningDefinition/801.json
+++ b/data/json/SummoningDefinition/801.json
@@ -7,23 +7,29 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2343,
+    "defaultSkin": 5483,
     "skins": [
-      2343
+      5483
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "x",
+          "value": -1
+        }
+      ],
+      "hasEffects": true,
       "keywordReferences": []
     },
     "families": [
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 91.0,
+      "baseValue": 77.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,32 +40,41 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 20.0,
+      "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Ben Coupe Gorge",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN PIRA\u0027BWORK - Larbin Monté Pirate",
+  "m_availability": 3,
   "m_i18nNameId": 19054,
+  "m_i18nChampionNameId": 78417,
   "m_i18nDescriptionId": 69977,
-  "assetGuid": ""
+  "assetGuid": "53ddf7a57ff620540beb4be47017e00b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/804.json b/data/json/SummoningDefinition/804.json
index 83f96bcdf9b6f9f946eeccb1bc0719f4c78bb8b6..602fc40c28243f3942b539850dbd5bd3a8c319bb 100644
--- a/data/json/SummoningDefinition/804.json
+++ b/data/json/SummoningDefinition/804.json
@@ -26,7 +26,7 @@
       59
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 55.0,
       "factor": {
@@ -39,29 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-      "referenceId": "",
-      "baseValue": 18.0,
-      "factor": {
-        "type": "ReferenceScalingFactor",
-        "reference": 0
-      }
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -74,6 +78,7 @@
   "m_displayName": "MONSTRE GELEE - Geline Fraise",
   "m_availability": 2,
   "m_i18nNameId": 89627,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 58910,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/808.json b/data/json/SummoningDefinition/808.json
index 9de9fad698fced1230894be094ee500737aa5843..e78ea7e9e4745b6f067d2ee52a4713911e792d28 100644
--- a/data/json/SummoningDefinition/808.json
+++ b/data/json/SummoningDefinition/808.json
@@ -39,21 +39,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 14
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "OSAMODAS - BETE - Jeune Flaqueux",
   "m_availability": 3,
   "m_i18nNameId": 40620,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 55928,
   "assetGuid": "c55be901d5b82864d864a33d1650c202"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/810.json b/data/json/SummoningDefinition/810.json
index 95a71423c1f47024bf716990e75c4f9d841b913e..9c66f6f546a45e1f41fc8380f8d3df91785c4ed0 100644
--- a/data/json/SummoningDefinition/810.json
+++ b/data/json/SummoningDefinition/810.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.8,
       "factor": 1.2
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Mini Dragon Rouge",
   "m_availability": 2,
   "m_i18nNameId": 40724,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 12641,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/811.json b/data/json/SummoningDefinition/811.json
index 1c79604ac19d18ef8de54b7ac1268fbd4cc6344c..71284dea59802839c87d4680ab7bc42a549501af 100644
--- a/data/json/SummoningDefinition/811.json
+++ b/data/json/SummoningDefinition/811.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 19
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE RAT - Rat Diation(not used)",
   "m_availability": 0,
   "m_i18nNameId": 88076,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 35990,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/812.json b/data/json/SummoningDefinition/812.json
index f2ccd05c9c3bd69f4d6f30374d54a7a839b5abf8..e7ecacf4332d5eb2d984835c50e23cc11d9c7993 100644
--- a/data/json/SummoningDefinition/812.json
+++ b/data/json/SummoningDefinition/812.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 21.6,
       "factor": 2.4
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE ABRAKNYDE - Abraknyde Toxique",
   "m_availability": 2,
   "m_i18nNameId": 83134,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 24464,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/813.json b/data/json/SummoningDefinition/813.json
index f03425e9d80ae286155ffbbedba9984f8356162d..f3df07fd9cb6b0d3718e2b93758a31b83dab377f 100644
--- a/data/json/SummoningDefinition/813.json
+++ b/data/json/SummoningDefinition/813.json
@@ -31,21 +31,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 35
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -53,6 +61,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Lectrik",
   "m_availability": 2,
   "m_i18nNameId": 74566,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 22857,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/814.json b/data/json/SummoningDefinition/814.json
index 49800cd615f8ef0d89c1df8170d577e32510cd4f..a0d255799f94e8c2d60f5659f08a74977c1ba255 100644
--- a/data/json/SummoningDefinition/814.json
+++ b/data/json/SummoningDefinition/814.json
@@ -26,7 +26,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 202.0,
       "factor": {
@@ -39,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 75
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 750
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -65,6 +73,7 @@
   "m_displayName": "MONSTRE COCHON - Jon Kriz",
   "m_availability": 3,
   "m_i18nNameId": 60671,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 38882,
   "assetGuid": "880489bb6f1be5a4f905d1d439bc0034"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/815.json b/data/json/SummoningDefinition/815.json
index 8dcd839f3cdeddc65f310bc13535130c2a486fdf..e3513c6f22bb24829bdb0e95030642be691fea33 100644
--- a/data/json/SummoningDefinition/815.json
+++ b/data/json/SummoningDefinition/815.json
@@ -31,21 +31,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 23
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -53,6 +61,7 @@
   "m_displayName": "OSAMODAS - BETE - Jeune Bouftou",
   "m_availability": 3,
   "m_i18nNameId": 64862,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 61108,
   "assetGuid": "4b531035e24e2fa4e9bf5ae4f8788945"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/825.json b/data/json/SummoningDefinition/825.json
index 3439e4da98fff5525edec36af8067062f254854a..808be4a84c8285f1c3b2330ad7e5d4df8b977f57 100644
--- a/data/json/SummoningDefinition/825.json
+++ b/data/json/SummoningDefinition/825.json
@@ -29,7 +29,7 @@
       "baseValue": 101.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +87,7 @@
   "m_displayName": "XELOR - LEGENDAIRE - Sarcophagus",
   "m_availability": 3,
   "m_i18nNameId": 52071,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 73976,
   "assetGuid": "b64f931c2d99d2544b4c0ede53599995"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/83.json b/data/json/SummoningDefinition/83.json
index 305c57d18e0f1e3ed468199c1c1fb77b136a84e1..7857811cb11a9e04c7627cb88c69bbebc5d13ed5 100644
--- a/data/json/SummoningDefinition/83.json
+++ b/data/json/SummoningDefinition/83.json
@@ -19,7 +19,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 121.0,
       "factor": {
@@ -32,25 +32,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - Craqueleur Ancestral",
   "m_availability": 2,
   "m_i18nNameId": 90266,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 30927,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/831.json b/data/json/SummoningDefinition/831.json
index 29e17810a75d1f2aa4226ce49e0aaa1038385367..ac69a5e2415704f4fa5599dc0b92d50728e62673 100644
--- a/data/json/SummoningDefinition/831.json
+++ b/data/json/SummoningDefinition/831.json
@@ -44,16 +44,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -70,6 +60,24 @@
         28
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -77,6 +85,7 @@
   "m_displayName": "SRAM - Ombre Bourbeuse",
   "m_availability": 2,
   "m_i18nNameId": 22981,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 78645,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/838.json b/data/json/SummoningDefinition/838.json
index 1a12146579e6937f50e872dd95295d6eb8dc8de7..ff69bc1427b70a2fe2df61876b65a7f55935bc14 100644
--- a/data/json/SummoningDefinition/838.json
+++ b/data/json/SummoningDefinition/838.json
@@ -26,7 +26,7 @@
       59
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 55.0,
       "factor": {
@@ -39,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -70,6 +78,7 @@
   "m_displayName": "MONSTRE GELEE - Geline Citron",
   "m_availability": 2,
   "m_i18nNameId": 28177,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 78987,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/842.json b/data/json/SummoningDefinition/842.json
index 67c06a89d7a6a2271bbcb03d6f5b1a3c4b8cfec5..998f6b8eed5db3fa4df673dcd1ac47f269526775 100644
--- a/data/json/SummoningDefinition/842.json
+++ b/data/json/SummoningDefinition/842.json
@@ -13,11 +13,16 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "perc",
+          "value": 50
+        }
+      ],
       "hasEffects": false,
       "keywordReferences": [
         "PADMAAURA",
-        "BATSU",
         "DIRTY"
       ]
     },
@@ -26,9 +31,9 @@
       65
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 95.0,
+      "baseValue": 109.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -39,32 +44,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 20.0,
+      "baseValue": 14.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Porman Bates",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN BOUCHER - Instructeur Cochon Boucher",
+  "m_availability": 3,
   "m_i18nNameId": 3387,
+  "m_i18nChampionNameId": 20730,
   "m_i18nDescriptionId": 5360,
   "assetGuid": "e5a9d6a2f6618bb4cb67096697fc370c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/845.json b/data/json/SummoningDefinition/845.json
index d9f16570bf48a448223a458ed0d746f4fd32dee9..32bdd0135144414364ee4c6fb94263199dac9632 100644
--- a/data/json/SummoningDefinition/845.json
+++ b/data/json/SummoningDefinition/845.json
@@ -15,7 +15,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar",
           "baseValue": 10.0,
           "factor": {
@@ -24,7 +24,7 @@
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "bl",
           "baseValue": 10.0,
           "factor": {
@@ -50,9 +50,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 107.0,
+      "baseValue": 92.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -63,25 +63,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -89,6 +113,7 @@
   "m_displayName": "MONSTRE CHAFER - Blockmort",
   "m_availability": 3,
   "m_i18nNameId": 14253,
+  "m_i18nChampionNameId": 46201,
   "m_i18nDescriptionId": 21027,
   "assetGuid": "083bade76ebaf904fb51afce63e90fd2"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/851.json b/data/json/SummoningDefinition/851.json
index cd8f6248dcd6f984fc5b33c5672da657f06e5a5e..05a2ba2ab321644642d31a4d763344eb9cf69989 100644
--- a/data/json/SummoningDefinition/851.json
+++ b/data/json/SummoningDefinition/851.json
@@ -21,13 +21,15 @@
         }
       ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       52
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 76.0,
       "factor": {
@@ -40,25 +42,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 20.0,
+      "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -79,6 +89,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Baliste",
   "m_availability": 2,
   "m_i18nNameId": 68403,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 32227,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/852.json b/data/json/SummoningDefinition/852.json
index 1086f5c2c5eda9adaf9455043439fe9e86b45a58..4ab88573a65efb81abf77765a61c4b63d527a195 100644
--- a/data/json/SummoningDefinition/852.json
+++ b/data/json/SummoningDefinition/852.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE PICHON - Pichon Blurp",
   "m_availability": 2,
   "m_i18nNameId": 64213,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 16731,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/854.json b/data/json/SummoningDefinition/854.json
index bacaa1a70cab32f3dd5a9af341595c0063c670ec..88315aa2de934ffaabf77925ad8101444c22b6ae 100644
--- a/data/json/SummoningDefinition/854.json
+++ b/data/json/SummoningDefinition/854.json
@@ -50,16 +50,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -76,6 +66,24 @@
         28
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -83,6 +91,7 @@
   "m_displayName": "SRAM - Ombre Boueuse",
   "m_availability": 2,
   "m_i18nNameId": 98878,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 16628,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/857.json b/data/json/SummoningDefinition/857.json
index 410c498c23f18c9d8f15be496222a6b60ec12e12..26a66be476f0215361734de8eafbb978e3a8defc 100644
--- a/data/json/SummoningDefinition/857.json
+++ b/data/json/SummoningDefinition/857.json
@@ -26,7 +26,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 101.0,
       "factor": {
@@ -39,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -65,6 +73,7 @@
   "m_displayName": "MONSTRE COCHON - Guerrier Boudeur",
   "m_availability": 3,
   "m_i18nNameId": 57340,
+  "m_i18nChampionNameId": 52920,
   "m_i18nDescriptionId": 62487,
   "assetGuid": "826fe6f7e82ff674fb07fc6c1b3773f6"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/859.json b/data/json/SummoningDefinition/859.json
index f8d8ddab4fbd939018b4ac0c0a8fec12d9592379..aaf148b433eea0892844af3b3e54101bf938f008 100644
--- a/data/json/SummoningDefinition/859.json
+++ b/data/json/SummoningDefinition/859.json
@@ -31,7 +31,7 @@
       51
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 91.0,
       "factor": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +78,7 @@
   "m_displayName": "MONSTRE GELEE - Drabonbon",
   "m_availability": 2,
   "m_i18nNameId": 52550,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 30260,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/860.json b/data/json/SummoningDefinition/860.json
index 33ad0ff374048ca2c5f873794080f2baab7e643d..842dc79235dacd72170780cc6ff3be26a8d997da 100644
--- a/data/json/SummoningDefinition/860.json
+++ b/data/json/SummoningDefinition/860.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 12",
   "m_availability": 2,
   "m_i18nNameId": 87276,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 14188,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/861.json b/data/json/SummoningDefinition/861.json
index 02beba0988cf75e5084b6dbc7292eeceb82fab99..441accab588f679898ff49f4f9646d6220d165a8 100644
--- a/data/json/SummoningDefinition/861.json
+++ b/data/json/SummoningDefinition/861.json
@@ -25,7 +25,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -38,18 +38,8 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 23.0,
       "factor": {
@@ -57,6 +47,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -77,6 +85,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN TREMBLEROCHE - craquenoud",
   "m_availability": 2,
   "m_i18nNameId": 34239,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 10154,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/866.json b/data/json/SummoningDefinition/866.json
index f10f483bd18032b6de8711d71559fe3b12ba0e55..f7fd77653c25410461abd076171d4b698e18489d 100644
--- a/data/json/SummoningDefinition/866.json
+++ b/data/json/SummoningDefinition/866.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Champion Craqueleur",
   "m_availability": 3,
   "m_i18nNameId": 22746,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 76556,
   "assetGuid": "c45d1e416da44f44a8b578ec1c8b82e7"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/867.json b/data/json/SummoningDefinition/867.json
index 62dfb08315cdf84fd487fb6134bc4eb70bdfdada..d6372b51f9e2471aff34416b576ce2823159304a 100644
--- a/data/json/SummoningDefinition/867.json
+++ b/data/json/SummoningDefinition/867.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 15
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Jeune Tofu",
   "m_availability": 3,
   "m_i18nNameId": 24759,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 61309,
   "assetGuid": "7ac36fde1c9184e46a3e313241ccc158"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/868.json b/data/json/SummoningDefinition/868.json
index 9c83c7819fe4faa71c96f40c6bef0fc742d26e93..e5330c4feb349eabc0c631fddae5ffba6a0618b4 100644
--- a/data/json/SummoningDefinition/868.json
+++ b/data/json/SummoningDefinition/868.json
@@ -15,12 +15,12 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
@@ -40,7 +40,7 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 194.0,
       "factor": {
@@ -53,25 +53,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 26.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -79,6 +87,7 @@
   "m_displayName": "MONSTRE BWORK - Bworky Pro Graisse",
   "m_availability": 3,
   "m_i18nNameId": 94380,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 92981,
   "assetGuid": "206e9239667e1a6488b4eea2c9ff8604"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/873.json b/data/json/SummoningDefinition/873.json
index af1f6f07c2cfbb7195022b4eae9be673ce14b2d8..1b7ab27ba0dad398535af720c964db04eca16ba6 100644
--- a/data/json/SummoningDefinition/873.json
+++ b/data/json/SummoningDefinition/873.json
@@ -28,7 +28,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 151.0,
       "factor": {
@@ -41,25 +41,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -67,6 +75,7 @@
   "m_displayName": "MONSTRE COCHON - Protecteur Sacré",
   "m_availability": 3,
   "m_i18nNameId": 85480,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 31262,
   "assetGuid": "0b04b37eae7a71041926210da8d63a7f"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/874.json b/data/json/SummoningDefinition/874.json
index e00b52a8244f97c551b8c205fea6aaf42ed18d56..fdfcf997845e8589a2073beda59f5642bc29d722 100644
--- a/data/json/SummoningDefinition/874.json
+++ b/data/json/SummoningDefinition/874.json
@@ -31,7 +31,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 250.0,
       "factor": {
@@ -44,25 +44,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 5
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 25.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +78,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - BOSS - La Montagne",
   "m_availability": 2,
   "m_i18nNameId": 34244,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 24928,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/875.json b/data/json/SummoningDefinition/875.json
index 14939dada5942470db1a6451be84f483b10b249d..313f092d27ebbdd92c3d64daf9dbf1f23e52bf69 100644
--- a/data/json/SummoningDefinition/875.json
+++ b/data/json/SummoningDefinition/875.json
@@ -42,16 +42,6 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntLevelOnlyBasedDynamicValue",
       "referenceId": "",
@@ -68,6 +58,24 @@
         28
       ]
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -75,6 +83,7 @@
   "m_displayName": "SRAM - Ombre Mouillée",
   "m_availability": 2,
   "m_i18nNameId": 28640,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 28326,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/876.json b/data/json/SummoningDefinition/876.json
index f4e02118b2497dbb5b743c08aaa878ca3ec4732d..dffe3bd74dba7405181a62710236bdd3acdf04eb 100644
--- a/data/json/SummoningDefinition/876.json
+++ b/data/json/SummoningDefinition/876.json
@@ -31,21 +31,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -53,6 +61,7 @@
   "m_displayName": "OSAMODAS - BETE - Chef Bouftou",
   "m_availability": 3,
   "m_i18nNameId": 6886,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 29669,
   "assetGuid": "60adc56a4a80e7844b1902b63827a319"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/877.json b/data/json/SummoningDefinition/877.json
index 931a8cb03d22916b47629f5503c6fca5ce38c190..a1d83796c75c4393d2a4556bf4c8124960a79733 100644
--- a/data/json/SummoningDefinition/877.json
+++ b/data/json/SummoningDefinition/877.json
@@ -19,7 +19,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 98.0,
       "factor": {
@@ -32,18 +32,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
@@ -51,6 +41,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE TAURE - Terminataure",
   "m_availability": 2,
   "m_i18nNameId": 58082,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 53947,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/878.json b/data/json/SummoningDefinition/878.json
index e7c6c3289e23a6d1f74184f04e0fa7c59fd11f7a..6a0b896cb5d22371ae862415e804421d6adbd632 100644
--- a/data/json/SummoningDefinition/878.json
+++ b/data/json/SummoningDefinition/878.json
@@ -18,13 +18,9 @@
           "value": 2
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 3.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 1
-          }
+          "value": 20
         }
       ],
       "hasEffects": true,
@@ -34,7 +30,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 60.0,
       "factor": {
@@ -47,18 +43,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 4.0,
       "factor": {
@@ -66,6 +52,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -73,6 +77,7 @@
   "m_displayName": "MONSTRE TAURE - Taurino",
   "m_availability": 2,
   "m_i18nNameId": 43936,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 3827,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/884.json b/data/json/SummoningDefinition/884.json
index 504c0b5b9002e51bd1fdfe10bea0d2b29215517b..809e96ae42bc113bb2c5ed23bcf191020e9245e4 100644
--- a/data/json/SummoningDefinition/884.json
+++ b/data/json/SummoningDefinition/884.json
@@ -31,16 +31,24 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -48,6 +56,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Oeuf Gris",
   "m_availability": 2,
   "m_i18nNameId": 63137,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 92136,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/885.json b/data/json/SummoningDefinition/885.json
index 194b6edd1466cc5c86e78702d375c421cc5c3822..38366b22b589bb7521e00c6e53ea4cfd25550e1f 100644
--- a/data/json/SummoningDefinition/885.json
+++ b/data/json/SummoningDefinition/885.json
@@ -35,7 +35,7 @@
       "baseValue": 58.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -43,25 +43,33 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +77,7 @@
   "m_displayName": "COMPAGNON - AMALIA - Poupée d\u0027Amalia",
   "m_availability": 2,
   "m_i18nNameId": 11661,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 75520,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/889.json b/data/json/SummoningDefinition/889.json
index a77cdd3352a9f7f222007a259b8e78596c445427..24005db9344d81f1cf241b15db9944d0b8bfb95f 100644
--- a/data/json/SummoningDefinition/889.json
+++ b/data/json/SummoningDefinition/889.json
@@ -21,7 +21,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 178.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 24.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE TOFU - Boss de donjon - Tofuventail",
   "m_availability": 2,
   "m_i18nNameId": 64493,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 92676,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/890.json b/data/json/SummoningDefinition/890.json
index d7fdcf87dbf4319fe59c91e14807373fab5ff609..96e1ee3291e3185d6ae127ee6724edb47d190be7 100644
--- a/data/json/SummoningDefinition/890.json
+++ b/data/json/SummoningDefinition/890.json
@@ -13,7 +13,17 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "ar",
+          "baseValue": 15.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": []
     },
@@ -21,9 +31,9 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 85.0,
+      "baseValue": 86.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -34,32 +44,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 26.0,
+      "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Castresse la Frigide",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE CHAFER - CLAN PIKAROSS - Châtreuse Pikaross",
+  "m_availability": 3,
   "m_i18nNameId": 42129,
+  "m_i18nChampionNameId": 90277,
   "m_i18nDescriptionId": 84603,
   "assetGuid": "4464be25804b3e64da84b642158e0c0b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/892.json b/data/json/SummoningDefinition/892.json
index 2be7f9086f349aa77be514dbf921b52eb17740c3..28d62d5ef84ac216f93186cc9928e251f16ff4fd 100644
--- a/data/json/SummoningDefinition/892.json
+++ b/data/json/SummoningDefinition/892.json
@@ -29,22 +29,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": 1.8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE TAURE - Moogr",
   "m_availability": 2,
   "m_i18nNameId": 41062,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 28195,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/895.json b/data/json/SummoningDefinition/895.json
index 8283aebe0078e7737995fdf60779b2065f7c59c6..b75b1d9c81329e1414f8539dd62efe21a267ec02 100644
--- a/data/json/SummoningDefinition/895.json
+++ b/data/json/SummoningDefinition/895.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.8,
       "factor": 1.2
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -54,6 +62,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Mini Dragon Vert",
   "m_availability": 2,
   "m_i18nNameId": 88645,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 71105,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/898.json b/data/json/SummoningDefinition/898.json
index 4a203f894fa7214487f7ffa2cab8276493596e44..af4c68b70592a4d4d3c3ec9819d0d19c5d5950af 100644
--- a/data/json/SummoningDefinition/898.json
+++ b/data/json/SummoningDefinition/898.json
@@ -26,7 +26,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -34,16 +34,40 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -51,6 +75,7 @@
   "m_displayName": "IOP - Âme Spectrale",
   "m_availability": 3,
   "m_i18nNameId": 14946,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 91064,
   "assetGuid": "2e7eac413ee0ec34ababd45db59c37c3"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/90.json b/data/json/SummoningDefinition/90.json
index cde0eab82e9206e888b0d8051264fe5efe317d0c..8b397b12488d882a41a9f698517c900168e11947 100644
--- a/data/json/SummoningDefinition/90.json
+++ b/data/json/SummoningDefinition/90.json
@@ -7,45 +7,57 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2637,
+    "defaultSkin": 1306,
     "skins": [
-      2637
+      1306
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "dmg",
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 3
+        },
+        {
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "min",
           "baseValue": 15.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "h",
-          "baseValue": 15.0,
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "dmg",
+          "baseValue": 18.4,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 11
           }
         }
       ],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
-        "ANGRYDRIVE"
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        {
+          "type": 25,
+          "id": 589
+        }
       ]
     },
     "families": [
-      49,
-      63
+      49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 105.0,
+      "baseValue": 95.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -56,32 +68,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 20.0,
+      "baseValue": 17.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Bworkokète",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Bworkette Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 52849,
+  "m_i18nChampionNameId": 24981,
   "m_i18nDescriptionId": 46410,
-  "assetGuid": ""
+  "assetGuid": "3c4958db346bbe145b4a8d98eab34cf0"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/903.json b/data/json/SummoningDefinition/903.json
index feb86657294352ec7632e9a25660ee149949639b..8c324f1a0718effe3306f6a61a55f12e4610a6c6 100644
--- a/data/json/SummoningDefinition/903.json
+++ b/data/json/SummoningDefinition/903.json
@@ -7,42 +7,45 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 1,
+    "defaultSkin": 7673,
     "skins": [
-      1
+      7673
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 2.0,
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "ar",
+          "baseValue": 10.0,
           "factor": {
             "type": "ReferenceScalingFactor",
             "reference": 0
           }
         },
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "ar",
-          "baseValue": 8.0,
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
+          "referenceId": "ex",
+          "baseValue": 11.0,
           "factor": {
             "type": "ReferenceScalingFactor",
-            "reference": 0
+            "reference": 1
           }
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
+        "EXALTED",
+        "EXPLOSION",
         "ANGRYDRIVE"
       ]
     },
     "families": [
-      49
+      49,
+      63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 191.0,
       "factor": {
@@ -55,38 +58,54 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
-    "actionType": 1,
-    "spells": [
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
       {
-        "type": "SpellOnSpawnWithDestination",
-        "spell": 304,
-        "destination": 4
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
       }
     ],
+    "actionType": 1,
+    "actionRange": {
+      "type": "ActionRange",
+      "min": {
+        "type": "ConstIntegerValue",
+        "referenceId": "",
+        "value": 1
+      },
+      "max": {
+        "type": "ConstIntegerValue",
+        "referenceId": "",
+        "value": 2
+      }
+    },
+    "spells": [],
     "cost": []
   },
   "m_displayName": "MONSTRE BWORK - GARDIEN - Goff Le Leader",
   "m_availability": 2,
   "m_i18nNameId": 94708,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 62553,
-  "assetGuid": ""
+  "assetGuid": "a554b399c52aea540af72c020b06242d"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/904.json b/data/json/SummoningDefinition/904.json
index c0edddf7d27118feb29b12fe353c53d9a4cb9b26..aa23f3ce8a88aa221021453cc31069349d6dfe0c 100644
--- a/data/json/SummoningDefinition/904.json
+++ b/data/json/SummoningDefinition/904.json
@@ -22,7 +22,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 92.0,
       "factor": {
@@ -35,25 +35,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -74,6 +82,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Archers Obscurs",
   "m_availability": 2,
   "m_i18nNameId": 34342,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 65909,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/905.json b/data/json/SummoningDefinition/905.json
index f274da9139bec7049db9ebe7f4f41fe66d3a44d0..705ec8014fdd83c845684d1875df8c2b139b207a 100644
--- a/data/json/SummoningDefinition/905.json
+++ b/data/json/SummoningDefinition/905.json
@@ -31,22 +31,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.5,
       "factor": 2.5
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Dragon Bleu",
   "m_availability": 2,
   "m_i18nNameId": 45691,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 29547,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/906.json b/data/json/SummoningDefinition/906.json
index 40345a2ee814ea6dfe8f362e490670a7d7dc7d01..bccbbfb84032871ce510dfe501fad8d3a1aebd0f 100644
--- a/data/json/SummoningDefinition/906.json
+++ b/data/json/SummoningDefinition/906.json
@@ -29,7 +29,7 @@
       "baseValue": 80.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -37,25 +37,49 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 42.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +87,7 @@
   "m_displayName": "IOP - LEGENDAIRE - Légendarus",
   "m_availability": 3,
   "m_i18nNameId": 9461,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 59119,
   "assetGuid": "a602cdcd2cb7dc94f865d51c2683112b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/907.json b/data/json/SummoningDefinition/907.json
index 9b0a982dfba2fe227b6f9f56d360a9a90c5cdc08..cb892485819654c847088ff7ace7737543abf7eb 100644
--- a/data/json/SummoningDefinition/907.json
+++ b/data/json/SummoningDefinition/907.json
@@ -26,7 +26,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 77.0,
       "factor": {
@@ -39,25 +39,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 200
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 200
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -78,6 +86,7 @@
   "m_displayName": "MONSTRE COCHON - Soldat Tripoux",
   "m_availability": 3,
   "m_i18nNameId": 96870,
+  "m_i18nChampionNameId": 26576,
   "m_i18nDescriptionId": 95675,
   "assetGuid": "c4317bedf8edf1d4ab5e4489adc71919"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/917.json b/data/json/SummoningDefinition/917.json
index f17807c2aeb21ad186c7918466b3df8e8c75325b..9cd60b38c9a8350cd91eb71056dd159a758c3076 100644
--- a/data/json/SummoningDefinition/917.json
+++ b/data/json/SummoningDefinition/917.json
@@ -23,7 +23,7 @@
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 40.0,
       "factor": {
@@ -36,25 +36,33 @@
       "referenceId": "",
       "value": 1
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +70,7 @@
   "m_displayName": "MONSTRE CHAFER - Crâne Noble",
   "m_availability": 3,
   "m_i18nNameId": 46279,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 34912,
   "assetGuid": "4ae23a495c92de3468455456c5ae705b"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/918.json b/data/json/SummoningDefinition/918.json
index 865099a294714c2c02e5980c482728f542a72a03..bc78f3442128aaaf6184634ed133c5d3cf263faa 100644
--- a/data/json/SummoningDefinition/918.json
+++ b/data/json/SummoningDefinition/918.json
@@ -13,44 +13,33 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "at",
-          "baseValue": 4.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        },
-        {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
-          "referenceId": "ar",
-          "baseValue": 8.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
-        "FATALBLADE",
         {
-          "type": 25,
-          "id": 863
+          "type": 6,
+          "id": 1203
+        },
+        "MECHANISM",
+        "EXPLOSION",
+        "FROZEN",
+        {
+          "type": 7,
+          "id": 249
         },
-        "UNTARGETABLE"
+        {
+          "type": 4,
+          "id": 701
+        }
       ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 181.0,
+      "baseValue": 158.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -61,38 +50,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
-    "actionType": 1,
-    "spells": [
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
       {
-        "type": "SpellOnSpawnWithDestination",
-        "spell": 863,
-        "destination": 1
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
       }
     ],
+    "actionType": 1,
+    "spells": [],
     "cost": []
   },
   "m_displayName": "MONSTRE CHAFER - GARDIEN - Comte Moross",
   "m_availability": 2,
   "m_i18nNameId": 73665,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 25291,
-  "assetGuid": ""
+  "assetGuid": "0aeb035a49e93004a94cacf1af734a51"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/92.json b/data/json/SummoningDefinition/92.json
index ef0b1bb1c3706b97aa93d67b320b272e05a52ea2..ef44e0c4346d46266b74f319fb99c315e635e74e 100644
--- a/data/json/SummoningDefinition/92.json
+++ b/data/json/SummoningDefinition/92.json
@@ -35,7 +35,7 @@
       "baseValue": 108.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -43,25 +43,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +93,7 @@
   "m_displayName": "CRA - LEGENDAIRE - Arkeüs",
   "m_availability": 3,
   "m_i18nNameId": 82152,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 9341,
   "assetGuid": "5ba9064a5d1e9af43a01447cd53183eb"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/920.json b/data/json/SummoningDefinition/920.json
index d8b6bf073429bd3341950282e09fb853f041ba2a..95062584624ca397f72c6ff2085a456cdf2b328d 100644
--- a/data/json/SummoningDefinition/920.json
+++ b/data/json/SummoningDefinition/920.json
@@ -35,7 +35,7 @@
       "baseValue": 132.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -43,25 +43,49 @@
       "referenceId": "",
       "value": 2
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 22.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -69,6 +93,7 @@
   "m_displayName": "GEMME - Esprit de Feu",
   "m_availability": 3,
   "m_i18nNameId": 80482,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 44589,
   "assetGuid": "c70d48ef9ed6a8a4c8cc41f3924c6b08"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/921.json b/data/json/SummoningDefinition/921.json
index c3c5decc53a88e5c19dd50a0a29150510502b034..b0c87f1da9f39950ff4cb44c8f2ebd4151d19c32 100644
--- a/data/json/SummoningDefinition/921.json
+++ b/data/json/SummoningDefinition/921.json
@@ -27,7 +27,7 @@
       37
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 60.0,
       "factor": {
@@ -40,25 +40,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -66,6 +74,7 @@
   "m_displayName": "MONSTRE TOFU - Monstres de base - Petit Tofu",
   "m_availability": 2,
   "m_i18nNameId": 45568,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 49995,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/928.json b/data/json/SummoningDefinition/928.json
index d2c2b5bd26e0afca0461a741eddf5d4d661ff476..5a4685328f00304e0117f041fc1c314281640021 100644
--- a/data/json/SummoningDefinition/928.json
+++ b/data/json/SummoningDefinition/928.json
@@ -30,32 +30,46 @@
       36
     ],
     "life": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 191.0,
-      "factor": 21.2
+      "baseValue": 212.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 0
+      }
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 7.0,
-      "factor": 0.8
+      "baseValue": 8.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 1
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -63,6 +77,7 @@
   "m_displayName": "MONSTRE BOUFTOU - BOSS - Sir Bergerax",
   "m_availability": 2,
   "m_i18nNameId": 20741,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 87198,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/933.json b/data/json/SummoningDefinition/933.json
index 7ccc105ce2b6fef1aa4f49b87abafe35d58eab14..c0b881236121981efb92468ab9b8b13acb5eab11 100644
--- a/data/json/SummoningDefinition/933.json
+++ b/data/json/SummoningDefinition/933.json
@@ -30,7 +30,7 @@
       58
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 32.0,
       "factor": {
@@ -43,25 +43,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": [],
@@ -74,6 +82,7 @@
   "m_displayName": "MONSTRE GELEE - Gelbibi Citron",
   "m_availability": 2,
   "m_i18nNameId": 71826,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 38035,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/938.json b/data/json/SummoningDefinition/938.json
index aabd0f2719dbb61236288d017f976f75fc55973b..8216a9a7290dc9078b85cd9d47348733568c3f91 100644
--- a/data/json/SummoningDefinition/938.json
+++ b/data/json/SummoningDefinition/938.json
@@ -15,13 +15,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 30
         }
       ],
       "hasEffects": true,
@@ -35,7 +31,7 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 189.0,
       "factor": {
@@ -48,25 +44,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -80,6 +84,7 @@
   "m_displayName": "MONSTRE BWORK - GARDIEN - Rogan L\u0027Attachant",
   "m_availability": 2,
   "m_i18nNameId": 90208,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 77789,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/94.json b/data/json/SummoningDefinition/94.json
index 756790d953dc87d3c368868e5ca4506cc777f2cf..9af13fcc0ebe07e11532f051b5ba1615ca847fe3 100644
--- a/data/json/SummoningDefinition/94.json
+++ b/data/json/SummoningDefinition/94.json
@@ -22,7 +22,7 @@
       41
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 90.0,
       "factor": {
@@ -35,18 +35,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
@@ -54,6 +44,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -61,6 +69,7 @@
   "m_displayName": "MONSTRE CRAQUELEUR - CLAN CRAQBOWLEUR - Le Sparqueleur",
   "m_availability": 2,
   "m_i18nNameId": 76543,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 41232,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/941.json b/data/json/SummoningDefinition/941.json
index 3e746470ddf95808112053f776fd19fab08db774..13417d7429ce45b7dc5cf6246c1dc1c3b028df1b 100644
--- a/data/json/SummoningDefinition/941.json
+++ b/data/json/SummoningDefinition/941.json
@@ -37,7 +37,7 @@
       "baseValue": 30.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -45,16 +45,40 @@
       "referenceId": "",
       "value": 0
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 0,
     "spells": [],
     "cost": []
@@ -62,6 +86,7 @@
   "m_displayName": "IOP - Mausolâme",
   "m_availability": 3,
   "m_i18nNameId": 58240,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 18939,
   "assetGuid": "814e3641e718bcc41a462207fc62ed05"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/943.json b/data/json/SummoningDefinition/943.json
index 5f5e9946e062b74768b11003bdf7e651fbe2b05c..b0b45dc928a09e0825cde737d66a204c07a1bd9e 100644
--- a/data/json/SummoningDefinition/943.json
+++ b/data/json/SummoningDefinition/943.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 04",
   "m_availability": 2,
   "m_i18nNameId": 66112,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 68789,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/948.json b/data/json/SummoningDefinition/948.json
index debade5bdd0986be8091534837ac046ff42ce7d3..efa8ea10dbb2a406d3e4ab7e091d1e6065c4eb5e 100644
--- a/data/json/SummoningDefinition/948.json
+++ b/data/json/SummoningDefinition/948.json
@@ -13,7 +13,13 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "c",
+          "value": 5
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": [
         "BUSHIAURA",
@@ -26,7 +32,7 @@
       64
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 93.0,
       "factor": {
@@ -39,32 +45,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 300
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 13.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 300
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Double de Mai Shiragrouik",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE COCHON - CLAN NINJA - Double de Coppa le Copain Ninja",
+  "m_availability": 3,
   "m_i18nNameId": 39973,
+  "m_i18nChampionNameId": 77981,
   "m_i18nDescriptionId": 82432,
   "assetGuid": "461621547321e554c9875729f2466eba"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/95.json b/data/json/SummoningDefinition/95.json
index d2e9a364ead8ab69481738a5f26805f47db311ca..2d0a2273ca96cd0747ac27c11a22d1100092bf55 100644
--- a/data/json/SummoningDefinition/95.json
+++ b/data/json/SummoningDefinition/95.json
@@ -30,21 +30,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 8
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -52,6 +60,7 @@
   "m_displayName": "MONSTRE PICHON - Etoile de la Mer d\u0027Asse",
   "m_availability": 2,
   "m_i18nNameId": 18710,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 2751,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/951.json b/data/json/SummoningDefinition/951.json
index f62bf2f54d94e6fd0727b2ab7e81d642b161a8d9..2270e0319480e0c3eda6921a48019cf1141a1f73 100644
--- a/data/json/SummoningDefinition/951.json
+++ b/data/json/SummoningDefinition/951.json
@@ -13,10 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "LinearLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "v",
-          "baseValue": 3.6,
-          "factor": 0.4
+          "value": 15
         }
       ],
       "hasEffects": true,
@@ -38,22 +37,30 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.7,
       "factor": 2.3
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [
       {
@@ -67,6 +74,7 @@
   "m_displayName": "MONSTRE DRAGOEUF - Dragon Marron",
   "m_availability": 2,
   "m_i18nNameId": 7424,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 92701,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/957.json b/data/json/SummoningDefinition/957.json
index 300f7076e2ea55ec2084b8bcf967a574ba406496..e246edf163ec9c95c699229b00f46014c7305660 100644
--- a/data/json/SummoningDefinition/957.json
+++ b/data/json/SummoningDefinition/957.json
@@ -5,8 +5,7 @@
     "type": "SummoningDefinition",
     "id": 957,
     "areaDefinition": {
-      "type": "PivotBasedSquareAreaDefinition",
-      "side": 2
+      "type": "PointAreaDefinition"
     },
     "defaultSkin": 8616,
     "skins": [
@@ -14,47 +13,74 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "at",
+          "value": 50
+        }
+      ],
+      "hasEffects": true,
+      "keywordReferences": [
+        "BUSHIAURA",
+        "CRITICAL",
+        "AURA",
+        "PORSHIDO"
+      ]
     },
     "families": [
-      50
+      50,
+      64
     ],
     "life": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 675.0,
-      "factor": 75.0
+      "baseValue": 250.0,
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 0
+      }
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 27.0,
-      "factor": 3.0
+      "factor": {
+        "type": "ReferenceScalingFactor",
+        "reference": 1
+      }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE COCHON - Jamon le Dragon-Cochon",
+  "m_displayName": "MONSTRE COCHON - GARDIEN - Jamon le Dragon-Cochon",
   "m_availability": 2,
   "m_i18nNameId": 8755,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 65072,
   "assetGuid": "232399f34afc2ff4da49e2cf3c6140ff"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/96.json b/data/json/SummoningDefinition/96.json
index 3dc6d8a9d6e65b2a1539abc3e8b2b709beacf3b5..934c4043faabe866329a136e717b1b1b4e374721 100644
--- a/data/json/SummoningDefinition/96.json
+++ b/data/json/SummoningDefinition/96.json
@@ -33,21 +33,29 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 9
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -55,6 +63,7 @@
   "m_displayName": "OSAMODAS - BETE - Bébé Tofu",
   "m_availability": 3,
   "m_i18nNameId": 73281,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 97757,
   "assetGuid": "6e0d1391992bf5b4a85d30caceaa979c"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/960.json b/data/json/SummoningDefinition/960.json
index 27d24ee73d7658cfb0667e20e9aa04868206d566..52e6b307103454c3ca92795e948cc4e422be8a06 100644
--- a/data/json/SummoningDefinition/960.json
+++ b/data/json/SummoningDefinition/960.json
@@ -21,7 +21,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 96.0,
       "factor": {
@@ -34,25 +34,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - Rascasse",
   "m_availability": 2,
   "m_i18nNameId": 80153,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 29603,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/966.json b/data/json/SummoningDefinition/966.json
index 1eeffc10ebf39fdf1aac8a10f4584e5de6f40615..241e66284b605245a3895cc853c0744ef3dcab0a 100644
--- a/data/json/SummoningDefinition/966.json
+++ b/data/json/SummoningDefinition/966.json
@@ -29,7 +29,7 @@
       50
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 173.0,
       "factor": {
@@ -42,25 +42,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 10.0,
+      "baseValue": 15.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE COCHON - Impératrice Galantine",
   "m_availability": 3,
   "m_i18nNameId": 3427,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 34801,
   "assetGuid": "f44a9b75442898c498eaf15ad71fbaaa"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/973.json b/data/json/SummoningDefinition/973.json
index 7ec29bd76b95bc1868399382d23495d922f72b92..0de8fb3244f03a3b5864fa14091675c1e38015ee 100644
--- a/data/json/SummoningDefinition/973.json
+++ b/data/json/SummoningDefinition/973.json
@@ -16,26 +16,33 @@
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "at",
-          "value": 20
+          "referenceId": "buffP",
+          "value": 10
         }
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AROUND",
-        "ADJACENT",
         {
-          "type": 25,
-          "id": 36117
+          "type": 6,
+          "id": 1203
         },
-        "LIFESTEAL"
+        "MECHANISM",
+        "EXPLOSION",
+        {
+          "type": 4,
+          "id": 701
+        },
+        {
+          "type": 7,
+          "id": 249
+        }
       ]
     },
     "families": [
       40
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 158.0,
       "factor": {
@@ -48,38 +55,41 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
-    "actionType": 1,
-    "spells": [
+    "stats": [
       {
-        "type": "SpellOnSpawnWithDestination",
-        "spell": 36117,
-        "destination": 1
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
       }
     ],
+    "actionType": 1,
+    "spells": [],
     "cost": []
   },
   "m_displayName": "MONSTRE CHAFER - GARDIEN - Comte Mélankar",
   "m_availability": 2,
   "m_i18nNameId": 19562,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 26573,
-  "assetGuid": ""
+  "assetGuid": "c8bcde0a17c29ae4881ec5e110944ce6"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/975.json b/data/json/SummoningDefinition/975.json
index b532d79cc97285a07c4a2f9757f844e68da3a2d2..699fc01cf4aad5d25e13f38333df1ff131dad34c 100644
--- a/data/json/SummoningDefinition/975.json
+++ b/data/json/SummoningDefinition/975.json
@@ -21,7 +21,7 @@
       56
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 76.0,
       "factor": {
@@ -34,18 +34,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
@@ -53,6 +43,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -60,6 +68,7 @@
   "m_displayName": "MONSTRE TAURE - Costaure",
   "m_availability": 2,
   "m_i18nNameId": 24866,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 58675,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/976.json b/data/json/SummoningDefinition/976.json
index 328608e13312fcdc6a08b9bce20848020f427c93..82993758eba624633c3d64091387bc3b3bf4a727 100644
--- a/data/json/SummoningDefinition/976.json
+++ b/data/json/SummoningDefinition/976.json
@@ -25,7 +25,7 @@
       66
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -38,25 +38,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 100
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 16.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 100
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -64,6 +72,7 @@
   "m_displayName": "MONSTRE CHUCHOTEUR - Chevaliers d\u0027Or",
   "m_availability": 2,
   "m_i18nNameId": 54091,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 27135,
   "assetGuid": "cb2c2e7d842460048a01bc52edefef04"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/979.json b/data/json/SummoningDefinition/979.json
index 6bda3e73a3d5e38ddab80689d1cb86c7627c74a3..ed890aa7cfc7682433af4bc2993722d241ac7c15 100644
--- a/data/json/SummoningDefinition/979.json
+++ b/data/json/SummoningDefinition/979.json
@@ -19,7 +19,7 @@
     },
     "families": [],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 15.0,
       "factor": {
@@ -32,25 +32,33 @@
       "referenceId": "",
       "value": 4
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 8.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -58,6 +66,7 @@
   "m_displayName": "MONSTRE BOUFTOU - Pupuce",
   "m_availability": 2,
   "m_i18nNameId": 69207,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 41773,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/981.json b/data/json/SummoningDefinition/981.json
index 597b92a4dbb13e556b78b74c62f1780b182f69f1..53bdd8b5b16730d918472d056cd5e110dab26813 100644
--- a/data/json/SummoningDefinition/981.json
+++ b/data/json/SummoningDefinition/981.json
@@ -13,13 +13,9 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
           "referenceId": "at",
-          "baseValue": 6.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 35
         }
       ],
       "hasEffects": true,
@@ -31,7 +27,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 206.0,
       "factor": {
@@ -44,25 +40,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 18.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -70,6 +74,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - [Boss] Requin",
   "m_availability": 2,
   "m_i18nNameId": 23294,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 87789,
   "assetGuid": "5b816ce5031faaf4ca90327aa28b7259"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/982.json b/data/json/SummoningDefinition/982.json
index d2ce7edfcc8887d91ad7274577979654667ca7a8..6ceef4798cfbb65e3a826e4fac60289e124d420d 100644
--- a/data/json/SummoningDefinition/982.json
+++ b/data/json/SummoningDefinition/982.json
@@ -28,21 +28,29 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 10
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -50,6 +58,7 @@
   "m_displayName": "MONSTRE FLAQUEUX - 05",
   "m_availability": 2,
   "m_i18nNameId": 74616,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 50487,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/990.json b/data/json/SummoningDefinition/990.json
index 57e054ed816c4ff06be244552cd71bdf05563123..17c110888a4d356ac4bde8a7dfb77d75ab3cfb3c 100644
--- a/data/json/SummoningDefinition/990.json
+++ b/data/json/SummoningDefinition/990.json
@@ -7,27 +7,32 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2862,
+    "defaultSkin": 5039,
     "skins": [
-      2862
+      5039
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "ConstIntegerValue",
+          "referenceId": "ar",
+          "value": 12
+        },
+        {
+          "type": "ConstIntegerValue",
           "referenceId": "ex",
-          "baseValue": 11.0,
-          "factor": {
-            "type": "ReferenceScalingFactor",
-            "reference": 0
-          }
+          "value": 11
         }
       ],
-      "hasEffects": true,
+      "hasEffects": false,
       "keywordReferences": [
-        "EXPLOSION",
-        "ANGRYDRIVE"
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
+        "EXPLOSION"
       ]
     },
     "families": [
@@ -35,9 +40,9 @@
       63
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 97.0,
+      "baseValue": 93.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -46,27 +51,35 @@
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 2
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
+      "value": 3
     },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 16.0,
+      "baseValue": 24.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "customActionTarget": {
       "type": "FilteredEntitySelector",
       "from": {
@@ -89,9 +102,10 @@
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Magmabat",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Bworkokak Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 18764,
+  "m_i18nChampionNameId": 64150,
   "m_i18nDescriptionId": 93960,
-  "assetGuid": ""
+  "assetGuid": "f44eecdd8244af7439c906f82c74756e"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/991.json b/data/json/SummoningDefinition/991.json
index b0dba9e9ed385c25a8b18a7f107f03ae82b38195..1dd6842ff06cf7d0a110f91d8982e1073f92a225 100644
--- a/data/json/SummoningDefinition/991.json
+++ b/data/json/SummoningDefinition/991.json
@@ -13,7 +13,7 @@
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "dmg",
           "baseValue": 5.0,
           "factor": {
@@ -29,7 +29,7 @@
       57
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 100.0,
       "factor": {
@@ -42,18 +42,8 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 10.0,
       "factor": {
@@ -61,6 +51,24 @@
         "reference": 0
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -68,6 +76,7 @@
   "m_displayName": "MONSTRE ECAILLEUX - [Boss] Élémentaire d\u0027Eau",
   "m_availability": 2,
   "m_i18nNameId": 19093,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 64749,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/993.json b/data/json/SummoningDefinition/993.json
index 06946e89c2d5ad5e95e84b1df4feb2a95a474362..81ea4ae6409c234b7113b0175b73052eb09b8291 100644
--- a/data/json/SummoningDefinition/993.json
+++ b/data/json/SummoningDefinition/993.json
@@ -13,9 +13,16 @@
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "valueWakfu",
+          "value": 1
+        }
+      ],
       "hasEffects": false,
       "keywordReferences": [
+        "WAKFU",
         "UNIQUE"
       ]
     },
@@ -28,7 +35,7 @@
       "baseValue": 60.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 8
       }
     },
     "movementPoints": {
@@ -36,25 +43,49 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 12.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 3
+        "reference": 9
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -62,6 +93,7 @@
   "m_displayName": "GEMME - Dragonnet Chromatique",
   "m_availability": 3,
   "m_i18nNameId": 99208,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 35901,
   "assetGuid": "069ec61270816bc4592286828ac28b92"
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/995.json b/data/json/SummoningDefinition/995.json
index 8e52b7df4fd4687e526f155dc45acf4d8370c601..2fafbfcb5e4b98af12aa1e23d1b5d72af8ed9578 100644
--- a/data/json/SummoningDefinition/995.json
+++ b/data/json/SummoningDefinition/995.json
@@ -17,12 +17,16 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 5
+          "value": 25
         },
         {
-          "type": "ConstIntegerValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ar2",
-          "value": 10
+          "baseValue": 10.0,
+          "factor": {
+            "type": "ReferenceScalingFactor",
+            "reference": 0
+          }
         }
       ],
       "hasEffects": true,
@@ -38,7 +42,7 @@
       36
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 160.0,
       "factor": {
@@ -51,25 +55,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
       "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 0
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "spells": [],
     "cost": []
@@ -77,6 +89,7 @@
   "m_displayName": "MONSTRE BOUFTOU - BOSS - Cornan le Cornu",
   "m_availability": 2,
   "m_i18nNameId": 44882,
+  "m_i18nChampionNameId": 0,
   "m_i18nDescriptionId": 82176,
   "assetGuid": ""
 }
\ No newline at end of file
diff --git a/data/json/SummoningDefinition/999.json b/data/json/SummoningDefinition/999.json
index 10008691454569f2deaf323fad8a208f22cc73a0..dba80a3587668a575d06c6313142cf0ca1bc0273 100644
--- a/data/json/SummoningDefinition/999.json
+++ b/data/json/SummoningDefinition/999.json
@@ -7,15 +7,15 @@
     "areaDefinition": {
       "type": "PointAreaDefinition"
     },
-    "defaultSkin": 2795,
+    "defaultSkin": 3523,
     "skins": [
-      2795
+      3523
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
-          "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+          "type": "LinearScaleLevelOnlyBasedDynamicValue",
           "referenceId": "ex",
           "baseValue": 11.0,
           "factor": {
@@ -26,6 +26,11 @@
       ],
       "hasEffects": false,
       "keywordReferences": [
+        "FLOOR",
+        {
+          "type": 6,
+          "id": 278
+        },
         "EXPLOSION"
       ]
     },
@@ -33,9 +38,9 @@
       49
     ],
     "life": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 96.0,
+      "baseValue": 90.0,
       "factor": {
         "type": "ReferenceScalingFactor",
         "reference": 0
@@ -46,25 +51,33 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
     "actionValue": {
-      "type": "MultiplyScaleLevelOnlyBasedDynamicValue",
+      "type": "LinearScaleLevelOnlyBasedDynamicValue",
       "referenceId": "",
-      "baseValue": 14.0,
+      "baseValue": 20.0,
       "factor": {
         "type": "ReferenceScalingFactor",
-        "reference": 0
+        "reference": 1
       }
     },
+    "stats": [
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "actionRange": {
       "type": "ActionRange",
@@ -82,9 +95,10 @@
     "spells": [],
     "cost": []
   },
-  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Boom Boom",
-  "m_availability": 2,
+  "m_displayName": "MONSTRE BWORK - CLAN VOLCANO\u0027CULTE - Traqueur Volcano\u0027culte",
+  "m_availability": 3,
   "m_i18nNameId": 15139,
+  "m_i18nChampionNameId": 73306,
   "m_i18nDescriptionId": 57058,
-  "assetGuid": ""
+  "assetGuid": "0ba4a2b060ee7974d96082d4208fde1a"
 }
\ No newline at end of file
diff --git a/data/json/WeaponDefinition/141.json b/data/json/WeaponDefinition/141.json
index f55eb75bae86c00db9d4586366d29ca7f85f0c88..f40fe3225bd41857ec76e9f25993fe2927eae6cf 100644
--- a/data/json/WeaponDefinition/141.json
+++ b/data/json/WeaponDefinition/141.json
@@ -44,21 +44,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -161,7 +201,7 @@
     ]
   },
   "m_displayName": "ENIRIPSA - Gemme Déphasante",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 57806,
   "m_i18nDescriptionId": 40451,
   "assetGuid": "e68966e2d9e4e4a7b9fa71c6230cb160"
diff --git a/data/json/WeaponDefinition/143.json b/data/json/WeaponDefinition/143.json
index 88ed0f7b016b854089e1075c3b49e30ad37743b5..34c0299dd3a2cd316b17688b853d51e2bf8b7363 100644
--- a/data/json/WeaponDefinition/143.json
+++ b/data/json/WeaponDefinition/143.json
@@ -10,7 +10,11 @@
     "defaultSkin": 7460,
     "skins": [
       7063,
-      7460
+      7460,
+      9538,
+      4316,
+      7843,
+      9810
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -33,21 +37,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 34
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -63,7 +107,16 @@
       "value": 6
     },
     "spells": [
-      162
+      91,
+      390,
+      311,
+      271,
+      146,
+      162,
+      83872,
+      84287,
+      232,
+      84865
     ],
     "defaultDeck": 932,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/161.json b/data/json/WeaponDefinition/161.json
index 52bb4bd32d0a000825d090ecf09ea62fee97c0d1..150f117e5526230a3e23845db15e97e4785c1493 100644
--- a/data/json/WeaponDefinition/161.json
+++ b/data/json/WeaponDefinition/161.json
@@ -10,7 +10,11 @@
     "defaultSkin": 2069,
     "skins": [
       2069,
-      2157
+      2157,
+      3013,
+      2114,
+      3224,
+      2192
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -23,7 +27,6 @@
       ],
       "hasEffects": true,
       "keywordReferences": [
-        "AURA",
         "AVENGERHOURGLASS"
       ]
     },
@@ -40,21 +43,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 17
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -70,7 +113,16 @@
       "value": 6
     },
     "spells": [
-      611
+      811,
+      623,
+      904,
+      831,
+      155,
+      611,
+      86234,
+      86295,
+      86350,
+      86534
     ],
     "defaultDeck": 47,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/182.json b/data/json/WeaponDefinition/182.json
index 1fc97ddc7b31aeeefd975550dea2b529a1a30ca8..bcb66c928e23ef5b861ec4dd7f42fd4eed93e073 100644
--- a/data/json/WeaponDefinition/182.json
+++ b/data/json/WeaponDefinition/182.json
@@ -33,21 +33,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 29
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -150,7 +190,7 @@
     ]
   },
   "m_displayName": "SRAM - Ken Kartana",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 9221,
   "m_i18nDescriptionId": 77181,
   "assetGuid": "293a2ac2c08cf4443b73fbe945aeb9d5"
diff --git a/data/json/WeaponDefinition/191.json b/data/json/WeaponDefinition/191.json
index 70bcd7cc8e25d76956f06564bd2280ee8b6ae792..35a0b9c133090302e1f7785c450a541b65fdbf58 100644
--- a/data/json/WeaponDefinition/191.json
+++ b/data/json/WeaponDefinition/191.json
@@ -10,7 +10,11 @@
     "defaultSkin": 7476,
     "skins": [
       8335,
-      7476
+      7476,
+      6574,
+      1771,
+      2432,
+      6202
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -30,28 +34,68 @@
     "life": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 392
+      "value": 398
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -67,7 +111,16 @@
       "value": 6
     },
     "spells": [
-      289
+      828,
+      307,
+      757,
+      76,
+      466,
+      289,
+      337,
+      89420,
+      89474,
+      89584
     ],
     "defaultDeck": 512,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/196.json b/data/json/WeaponDefinition/196.json
index 918a5c3e956f8d569a996cad17d6a36096adf899..dbeadaa52b036c9e6e5ba66529eeaa0eb3c801e0 100644
--- a/data/json/WeaponDefinition/196.json
+++ b/data/json/WeaponDefinition/196.json
@@ -41,21 +41,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -158,7 +198,7 @@
     ]
   },
   "m_displayName": "OSAMODAS - Bâton de berger",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 90472,
   "m_i18nDescriptionId": 57149,
   "assetGuid": "64011dafa9cc949e9a169925cc3c3785"
diff --git a/data/json/WeaponDefinition/202.json b/data/json/WeaponDefinition/202.json
index 1397191a278832d5687d69ff44b21b450946774a..30a6de806688e2ccc1cfd9a988ebb136564299c9 100644
--- a/data/json/WeaponDefinition/202.json
+++ b/data/json/WeaponDefinition/202.json
@@ -39,21 +39,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -156,7 +196,7 @@
     ]
   },
   "m_displayName": "ENIRIPSA - Lame Voracius",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 20184,
   "m_i18nDescriptionId": 24537,
   "assetGuid": "42459bffd07f748ddbdfe8000a817f92"
diff --git a/data/json/WeaponDefinition/265.json b/data/json/WeaponDefinition/265.json
deleted file mode 100644
index 8564ab18f684181f0ed4aaf75d149954780f8c29..0000000000000000000000000000000000000000
--- a/data/json/WeaponDefinition/265.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "265",
-  "m_jsonRepresentation": {
-    "type": "WeaponDefinition",
-    "id": 265,
-    "areaDefinition": {
-      "type": "PointAreaDefinition"
-    },
-    "defaultSkin": 7086,
-    "skins": [
-      8325,
-      7086
-    ],
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": true,
-      "keywordReferences": [
-        "INVULNERABLE"
-      ]
-    },
-    "families": [],
-    "life": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 1
-    },
-    "movementPoints": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 3
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
-    "actionValue": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 10
-    },
-    "actionType": 1,
-    "merchantCosts": [],
-    "god": 0,
-    "playerActionPoints": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 6
-    },
-    "spells": [
-      18,
-      710,
-      780,
-      966,
-      8755
-    ],
-    "defaultDeck": 47,
-    "specificSkills": []
-  },
-  "m_displayName": "SPECTRE",
-  "m_availability": 0,
-  "m_i18nNameId": 62217,
-  "m_i18nDescriptionId": 21416,
-  "assetGuid": ""
-}
\ No newline at end of file
diff --git a/data/json/WeaponDefinition/277.json b/data/json/WeaponDefinition/277.json
index b3270fcb2a41069d3d6649652f120f83a023bed5..0161eeab63f2b215b631b463d8ba0e7e1574b25a 100644
--- a/data/json/WeaponDefinition/277.json
+++ b/data/json/WeaponDefinition/277.json
@@ -43,21 +43,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 23
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -160,7 +200,7 @@
     ]
   },
   "m_displayName": "ENIRIPSA - Ambre Tamashi",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 49603,
   "m_i18nDescriptionId": 78162,
   "assetGuid": "940a0fdbc494c4d8a8dafca4f00d01e1"
diff --git a/data/json/WeaponDefinition/315.json b/data/json/WeaponDefinition/315.json
index 6cbb55fead758c8ee9d7961761bceee61defca6e..9ef20b42387204aacb1ae7ba3a3450be2e5bcfe5 100644
--- a/data/json/WeaponDefinition/315.json
+++ b/data/json/WeaponDefinition/315.json
@@ -31,21 +31,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [],
     "god": 0,
diff --git a/data/json/WeaponDefinition/36.json b/data/json/WeaponDefinition/36.json
index 2bab6754044afeebb8581adad99c0735ff1c71c2..78deacabcd198493167569bfc2b59780225d0a51 100644
--- a/data/json/WeaponDefinition/36.json
+++ b/data/json/WeaponDefinition/36.json
@@ -34,21 +34,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -151,7 +191,7 @@
     ]
   },
   "m_displayName": "SRAM - Ecorcheur Shugen",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 89446,
   "m_i18nDescriptionId": 42371,
   "assetGuid": "afc281b1ef3b94d649596d37bcbb4e9f"
diff --git a/data/json/WeaponDefinition/366.json b/data/json/WeaponDefinition/366.json
index 03f02042b6ebda443d073da4cc53fb4aaa07066c..445660772d5ab4589b3a1d8c39d95751511bbf74 100644
--- a/data/json/WeaponDefinition/366.json
+++ b/data/json/WeaponDefinition/366.json
@@ -10,7 +10,11 @@
     "defaultSkin": 9367,
     "skins": [
       9367,
-      9731
+      9731,
+      9849,
+      2692,
+      9926,
+      7001
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -37,21 +41,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 22
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -67,7 +111,16 @@
       "value": 6
     },
     "spells": [
-      938
+      811,
+      623,
+      904,
+      831,
+      155,
+      938,
+      86555,
+      86764,
+      385,
+      131
     ],
     "defaultDeck": 239,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/381.json b/data/json/WeaponDefinition/381.json
index 4665fc2344867c910c542c8c1bf8561cc965178b..0507c26d54883fc6076edca565b12107e9d94443 100644
--- a/data/json/WeaponDefinition/381.json
+++ b/data/json/WeaponDefinition/381.json
@@ -39,21 +39,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -156,7 +196,7 @@
     ]
   },
   "m_displayName": "SACRIEUR - Darde Kan",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 66387,
   "m_i18nDescriptionId": 33118,
   "assetGuid": "3d62570e5b95948fbb15ada68fc4fda3"
diff --git a/data/json/WeaponDefinition/43.json b/data/json/WeaponDefinition/43.json
index 57f4fcb2170778124e576b4bbdd71fd2abfe854b..6163486e854b6ec6a2338d5d16849b377c60777f 100644
--- a/data/json/WeaponDefinition/43.json
+++ b/data/json/WeaponDefinition/43.json
@@ -33,21 +33,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -150,7 +190,7 @@
     ]
   },
   "m_displayName": "SACRIEUR - Pilobouli",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 52003,
   "m_i18nDescriptionId": 27929,
   "assetGuid": "34376f5bfe4024c028fc0f6123244c71"
diff --git a/data/json/WeaponDefinition/477.json b/data/json/WeaponDefinition/477.json
index c592d5455d1bb90e1efef5df98ee53a4f9c311a0..a2b314f718446300ffeabb4966097f1183ed8536 100644
--- a/data/json/WeaponDefinition/477.json
+++ b/data/json/WeaponDefinition/477.json
@@ -10,25 +10,23 @@
     "defaultSkin": 5780,
     "skins": [
       5780,
-      8143
+      8143,
+      2449,
+      2889,
+      4469,
+      1310
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
+          "referenceId": "nb",
+          "value": 2
         }
       ],
       "hasEffects": true,
-      "keywordReferences": [
-        "BOUNCE",
-        {
-          "type": 25,
-          "id": 531
-        }
-      ]
+      "keywordReferences": []
     },
     "families": [
       2
@@ -36,28 +34,68 @@
     "life": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 382
+      "value": 396
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 16
+      "value": 19
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -73,7 +111,16 @@
       "value": 6
     },
     "spells": [
-      531
+      828,
+      307,
+      757,
+      76,
+      466,
+      531,
+      456,
+      90125,
+      90331,
+      663
     ],
     "defaultDeck": 872,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/490.json b/data/json/WeaponDefinition/490.json
index fecf657af012fffd2c2ff96fa6a3eeb2504f04ce..7078c51790c89acfc3b89256a508811d534c10ad 100644
--- a/data/json/WeaponDefinition/490.json
+++ b/data/json/WeaponDefinition/490.json
@@ -10,11 +10,21 @@
     "defaultSkin": 5057,
     "skins": [
       5057,
-      5446
+      5446,
+      4068,
+      1365,
+      6824,
+      6580
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [],
+      "dynamicValueReferences": [
+        {
+          "type": "ConstIntegerValue",
+          "referenceId": "pa",
+          "value": 3
+        }
+      ],
       "hasEffects": true,
       "keywordReferences": []
     },
@@ -31,21 +41,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 20
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -61,7 +111,16 @@
       "value": 6
     },
     "spells": [
-      183
+      811,
+      623,
+      904,
+      831,
+      155,
+      183,
+      138,
+      660,
+      495,
+      89304
     ],
     "defaultDeck": 976,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/492.json b/data/json/WeaponDefinition/492.json
index 203eec8e685528eddf03e9e5f5aa6132d33998ad..a5ac4b661efad92d4c0bbde6dbea83afea63f8fe 100644
--- a/data/json/WeaponDefinition/492.json
+++ b/data/json/WeaponDefinition/492.json
@@ -31,21 +31,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -148,7 +188,7 @@
     ]
   },
   "m_displayName": "SACRIEUR - Bâton Tonfavik",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 36804,
   "m_i18nDescriptionId": 86308,
   "assetGuid": "7e3c09f4136c64476ba7edf83e61b70c"
diff --git a/data/json/WeaponDefinition/497.json b/data/json/WeaponDefinition/497.json
index b73a98c62fa453b710028170f4818eed7f15f2cf..b2e34dad977d23e4a412e4020449562367096cb0 100644
--- a/data/json/WeaponDefinition/497.json
+++ b/data/json/WeaponDefinition/497.json
@@ -10,7 +10,11 @@
     "defaultSkin": 6598,
     "skins": [
       6598,
-      1020
+      1020,
+      4033,
+      1831,
+      4809,
+      8041
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -31,21 +35,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 24
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -61,7 +105,16 @@
       "value": 6
     },
     "spells": [
-      1355
+      91,
+      390,
+      311,
+      271,
+      146,
+      1355,
+      750,
+      82219,
+      82295,
+      82646
     ],
     "defaultDeck": 313,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/534.json b/data/json/WeaponDefinition/534.json
index c90040d59c7fced6c5441ce3d54ef34611d168c5..bdbaf2d423c8d62c21e47dd250aea4f411e94f4b 100644
--- a/data/json/WeaponDefinition/534.json
+++ b/data/json/WeaponDefinition/534.json
@@ -10,7 +10,11 @@
     "defaultSkin": 9298,
     "skins": [
       3377,
-      9298
+      9298,
+      6788,
+      7599,
+      6630,
+      1574
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -31,21 +35,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 28
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -61,7 +105,16 @@
       "value": 6
     },
     "spells": [
-      885
+      91,
+      390,
+      311,
+      271,
+      146,
+      885,
+      81,
+      83214,
+      83533,
+      83619
     ],
     "defaultDeck": 235,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/614.json b/data/json/WeaponDefinition/614.json
index 3dd50b32746f38ca0109fd7d0ad46dcd546290b3..089d7df0189a88cf848430d525801c2da03c44e9 100644
--- a/data/json/WeaponDefinition/614.json
+++ b/data/json/WeaponDefinition/614.json
@@ -10,7 +10,11 @@
     "defaultSkin": 8549,
     "skins": [
       8549,
-      3371
+      3371,
+      2243,
+      1327,
+      2338,
+      1803
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -31,21 +35,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 23
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -61,7 +105,16 @@
       "value": 6
     },
     "spells": [
-      642
+      811,
+      623,
+      904,
+      831,
+      155,
+      642,
+      87062,
+      87583,
+      218,
+      87609
     ],
     "defaultDeck": 80,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/620.json b/data/json/WeaponDefinition/620.json
index dab7da6684d8a152519b4f0b9db5ade93c6f57f1..0e1ea706c2648da555230e55b5e4ce7d1366c469 100644
--- a/data/json/WeaponDefinition/620.json
+++ b/data/json/WeaponDefinition/620.json
@@ -41,21 +41,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 28
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -158,7 +198,7 @@
     ]
   },
   "m_displayName": "SRAM - Cisaille Orishi",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 29469,
   "m_i18nDescriptionId": 74247,
   "assetGuid": "96899c20aa6c14d209d40539f1b27d4f"
diff --git a/data/json/WeaponDefinition/625.json b/data/json/WeaponDefinition/625.json
index 5381c6aff120c75b04a4f41b634d566606deb562..b854f09fe15364d60f19324956f3dcc1d78a5de3 100644
--- a/data/json/WeaponDefinition/625.json
+++ b/data/json/WeaponDefinition/625.json
@@ -31,21 +31,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -148,7 +188,7 @@
     ]
   },
   "m_displayName": "OSAMODAS - Bâton Flaqueux",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 18164,
   "m_i18nDescriptionId": 92216,
   "assetGuid": "d377bff94dd184d2c91050c7b702be10"
diff --git a/data/json/WeaponDefinition/637.json b/data/json/WeaponDefinition/637.json
index 8169cac8f48ca9693fce0e603c18517a003383ca..f4e43e03ceb3703f5a37cb2236f79418658455b2 100644
--- a/data/json/WeaponDefinition/637.json
+++ b/data/json/WeaponDefinition/637.json
@@ -31,21 +31,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 18
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -148,7 +188,7 @@
     ]
   },
   "m_displayName": "ENIRIPSA - Scalpel de l\u0027Apostruker",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 15096,
   "m_i18nDescriptionId": 79735,
   "assetGuid": "f7bc028f354794028983274031bbb79d"
diff --git a/data/json/WeaponDefinition/660.json b/data/json/WeaponDefinition/660.json
index a34689f0826aab8a6dadf3cf027f002007371228..7fb97f7bd9a0f2a54dc161685f88d7be57ccc1c3 100644
--- a/data/json/WeaponDefinition/660.json
+++ b/data/json/WeaponDefinition/660.json
@@ -33,21 +33,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -150,7 +190,7 @@
     ]
   },
   "m_displayName": "SACRIEUR - Gantares des Cendres",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 81887,
   "m_i18nDescriptionId": 80591,
   "assetGuid": "798c2bc937ce145d297791fd9148e528"
diff --git a/data/json/WeaponDefinition/677.json b/data/json/WeaponDefinition/677.json
index 96afcee5e4cecbfaababfdad338e64a814b57dd9..e5e99020cddbe8243150f075e828678ae943f9ae 100644
--- a/data/json/WeaponDefinition/677.json
+++ b/data/json/WeaponDefinition/677.json
@@ -39,21 +39,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 24
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -156,7 +196,7 @@
     ]
   },
   "m_displayName": "OSAMODAS - Bâton Prespic",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 25275,
   "m_i18nDescriptionId": 21127,
   "assetGuid": "e8759fb020b7a42188cc68e321475023"
diff --git a/data/json/WeaponDefinition/75.json b/data/json/WeaponDefinition/75.json
index 7c3efd67ad0bc05fb078f7d68bd9f6c07d130e0c..97256337d7c09395b431ad933dcfc3a94e273be5 100644
--- a/data/json/WeaponDefinition/75.json
+++ b/data/json/WeaponDefinition/75.json
@@ -39,21 +39,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -156,7 +196,7 @@
     ]
   },
   "m_displayName": "OSAMODAS - Bâton Craqueleur",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 5731,
   "m_i18nDescriptionId": 61422,
   "assetGuid": "1ea5e6ffd74d84a8ab3871cd113e1ff8"
diff --git a/data/json/WeaponDefinition/816.json b/data/json/WeaponDefinition/816.json
deleted file mode 100644
index 0168124e028847b10d3a72ea144d04060f14f4ee..0000000000000000000000000000000000000000
--- a/data/json/WeaponDefinition/816.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "816",
-  "m_jsonRepresentation": {
-    "type": "WeaponDefinition",
-    "id": 816,
-    "areaDefinition": {
-      "type": "PointAreaDefinition"
-    },
-    "defaultSkin": 1,
-    "skins": [],
-    "precomputedData": {
-      "type": "PrecomputedData",
-      "dynamicValueReferences": [],
-      "hasEffects": false,
-      "keywordReferences": []
-    },
-    "families": [],
-    "life": {
-      "type": "ConstIntLevelOnlyBasedDynamicValue",
-      "referenceId": "",
-      "values": [
-        38,
-        51,
-        63,
-        75,
-        87,
-        107,
-        127,
-        146,
-        165,
-        184
-      ]
-    },
-    "movementPoints": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 2
-    },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
-    "actionValue": {
-      "type": "LinearLevelOnlyBasedDynamicValue",
-      "referenceId": "",
-      "baseValue": -1.0,
-      "factor": 1.0
-    },
-    "actionType": 1,
-    "merchantCosts": [],
-    "god": 0,
-    "playerActionPoints": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 6
-    },
-    "spells": [],
-    "defaultDeck": 47,
-    "specificSkills": []
-  },
-  "m_displayName": "No weapon",
-  "m_availability": 0,
-  "m_i18nNameId": 36975,
-  "m_i18nDescriptionId": 95166,
-  "assetGuid": ""
-}
\ No newline at end of file
diff --git a/data/json/WeaponDefinition/830.json b/data/json/WeaponDefinition/830.json
index c75faf38e6953ec1ed452233ba4accfb5efb9e33..3e5ad1fae4435de13db7d45efe278f25403f7016 100644
--- a/data/json/WeaponDefinition/830.json
+++ b/data/json/WeaponDefinition/830.json
@@ -31,21 +31,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 24
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -148,7 +188,7 @@
     ]
   },
   "m_displayName": "SRAM - Lame Ouraï",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 66555,
   "m_i18nDescriptionId": 41986,
   "assetGuid": "9d6f43fedbe1f4247b4eea7d7bc61081"
diff --git a/data/json/WeaponDefinition/846.json b/data/json/WeaponDefinition/846.json
index 825bcee3fd660132ab996982c55da41ff7b7fb1d..e4281a392ca458a0fd4cd97d19353f4daec5e6c0 100644
--- a/data/json/WeaponDefinition/846.json
+++ b/data/json/WeaponDefinition/846.json
@@ -10,19 +10,19 @@
     "defaultSkin": 2854,
     "skins": [
       2854,
-      1778
+      1778,
+      1222,
+      1841,
+      1755,
+      4992
     ],
     "precomputedData": {
       "type": "PrecomputedData",
-      "dynamicValueReferences": [
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
-        }
-      ],
+      "dynamicValueReferences": [],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     },
     "families": [
       2
@@ -30,28 +30,68 @@
     "life": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 394
+      "value": 400
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 18
+      "value": 20
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -67,7 +107,16 @@
       "value": 6
     },
     "spells": [
-      806
+      828,
+      307,
+      757,
+      76,
+      466,
+      806,
+      89602,
+      496,
+      89543,
+      89972
     ],
     "defaultDeck": 316,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/864.json b/data/json/WeaponDefinition/864.json
index 8980f96642227f983578fbaeded77f279957d058..684f0d549e7f47fb8be49f022381a6d1435d344d 100644
--- a/data/json/WeaponDefinition/864.json
+++ b/data/json/WeaponDefinition/864.json
@@ -37,21 +37,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -154,7 +194,7 @@
     ]
   },
   "m_displayName": "SACRIEUR - Ombraden",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 89287,
   "m_i18nDescriptionId": 79000,
   "assetGuid": "0ddab78c503d94b6abe94403a8ad9944"
diff --git a/data/json/WeaponDefinition/911.json b/data/json/WeaponDefinition/911.json
index ffb352f18ba7dbcf1a47b82aea92914bf7547795..b7caace5a0041264430abb6042dc475743f794c4 100644
--- a/data/json/WeaponDefinition/911.json
+++ b/data/json/WeaponDefinition/911.json
@@ -10,7 +10,11 @@
     "defaultSkin": 7614,
     "skins": [
       4131,
-      7614
+      7614,
+      8043,
+      5574,
+      5101,
+      2066
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -18,7 +22,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 15
+          "value": 50
         }
       ],
       "hasEffects": true,
@@ -39,21 +43,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 30
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -69,7 +113,16 @@
       "value": 6
     },
     "spells": [
-      476
+      91,
+      390,
+      311,
+      271,
+      146,
+      476,
+      676,
+      85790,
+      85804,
+      85829
     ],
     "defaultDeck": 499,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/919.json b/data/json/WeaponDefinition/919.json
index f88c1208f2607ce736f3e753ead80f4f758d0b18..61cda18ec1fc7566840fce2d57dfd34b59d2a6ff 100644
--- a/data/json/WeaponDefinition/919.json
+++ b/data/json/WeaponDefinition/919.json
@@ -10,7 +10,11 @@
     "defaultSkin": 7765,
     "skins": [
       8082,
-      7765
+      7765,
+      8576,
+      9395,
+      5526,
+      9900
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -18,7 +22,7 @@
         {
           "type": "ConstIntegerValue",
           "referenceId": "at",
-          "value": 4
+          "value": 12
         }
       ],
       "hasEffects": true,
@@ -37,21 +41,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 34
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -67,7 +111,16 @@
       "value": 6
     },
     "spells": [
-      48
+      91,
+      390,
+      311,
+      271,
+      146,
+      48,
+      81218,
+      81382,
+      81421,
+      630
     ],
     "defaultDeck": 611,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/937.json b/data/json/WeaponDefinition/937.json
index 96e01d54dda4a8e6391d229e2d2f351defe1a453..e54ccb7344255638968b0acf312fef28c8044b79 100644
--- a/data/json/WeaponDefinition/937.json
+++ b/data/json/WeaponDefinition/937.json
@@ -22,7 +22,9 @@
         }
       ],
       "hasEffects": false,
-      "keywordReferences": []
+      "keywordReferences": [
+        "PUSH"
+      ]
     },
     "families": [
       6
@@ -37,21 +39,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 35
+      "value": 33
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -154,7 +196,7 @@
     ]
   },
   "m_displayName": "SRAM - Surin Sourokan",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 28838,
   "m_i18nDescriptionId": 64614,
   "assetGuid": "79d97da2497d148c89fda2cfbd16368c"
diff --git a/data/json/WeaponDefinition/945.json b/data/json/WeaponDefinition/945.json
index 890f4390b0b61a465a5a0581ef8c851a840d92d3..c2939979c4dee7b5f361d41bdc44eb20c7d25d1a 100644
--- a/data/json/WeaponDefinition/945.json
+++ b/data/json/WeaponDefinition/945.json
@@ -10,7 +10,11 @@
     "defaultSkin": 1048,
     "skins": [
       1048,
-      3568
+      3568,
+      678,
+      958,
+      687,
+      1255
     ],
     "precomputedData": {
       "type": "PrecomputedData",
@@ -31,21 +35,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 22
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -61,7 +105,16 @@
       "value": 6
     },
     "spells": [
-      153
+      811,
+      623,
+      904,
+      831,
+      155,
+      153,
+      195,
+      87774,
+      88563,
+      89252
     ],
     "defaultDeck": 938,
     "specificSkills": [
diff --git a/data/json/WeaponDefinition/953.json b/data/json/WeaponDefinition/953.json
index f4bc80e10a4230d6a776e2ad7f4db1a8e396765b..4f3d1986a96303f5ef72dc6958f5eec9b5286ef0 100644
--- a/data/json/WeaponDefinition/953.json
+++ b/data/json/WeaponDefinition/953.json
@@ -10,20 +10,19 @@
     "defaultSkin": 8446,
     "skins": [
       1376,
-      8446
+      8446,
+      4007,
+      2237,
+      5096,
+      2206
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "pm",
-          "value": 2
+          "referenceId": "at",
+          "value": 67
         }
       ],
       "hasEffects": true,
@@ -35,28 +34,68 @@
     "life": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 392
+      "value": 394
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 24
+      "value": 12
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -72,6 +111,15 @@
       "value": 6
     },
     "spells": [
+      828,
+      307,
+      757,
+      76,
+      466,
+      288,
+      525,
+      626,
+      90035,
       667
     ],
     "defaultDeck": 534,
diff --git a/data/json/WeaponDefinition/967.json b/data/json/WeaponDefinition/967.json
index 51858e93c3a673c7be9c1b213f25b6f3ff455a4a..995ee103a60269b016bd280f4916502f01650a2c 100644
--- a/data/json/WeaponDefinition/967.json
+++ b/data/json/WeaponDefinition/967.json
@@ -31,21 +31,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 25
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -148,7 +188,7 @@
     ]
   },
   "m_displayName": "ENIRIPSA - Pinceau Kokoro",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 20731,
   "m_i18nDescriptionId": 17293,
   "assetGuid": "cff3673c2194646cfa3722029473a4dc"
diff --git a/data/json/WeaponDefinition/995.json b/data/json/WeaponDefinition/995.json
index a3c8766cd284a9a95f6d85fca0041da9af22e923..d2746a2f675860fa44dd0ba5405c8e6ad7d63d71 100644
--- a/data/json/WeaponDefinition/995.json
+++ b/data/json/WeaponDefinition/995.json
@@ -34,21 +34,61 @@
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 26
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -151,7 +191,7 @@
     ]
   },
   "m_displayName": "OSAMODAS - Bâton Tofu",
-  "m_availability": 0,
+  "m_availability": 2,
   "m_i18nNameId": 32685,
   "m_i18nDescriptionId": 32030,
   "assetGuid": "ba20b43e897f64b25a14157a8e333234"
diff --git a/data/json/WeaponDefinition/998.json b/data/json/WeaponDefinition/998.json
index 2645a94729ecf1761e035599652a2f7fb2db38e4..0230a24fe7fdda1046019c460c37e050aee08c7f 100644
--- a/data/json/WeaponDefinition/998.json
+++ b/data/json/WeaponDefinition/998.json
@@ -10,24 +10,25 @@
     "defaultSkin": 1250,
     "skins": [
       3361,
-      1250
+      1250,
+      7975,
+      6845,
+      9137,
+      8718
     ],
     "precomputedData": {
       "type": "PrecomputedData",
       "dynamicValueReferences": [
         {
           "type": "ConstIntegerValue",
-          "referenceId": "c",
-          "value": 3
-        },
-        {
-          "type": "ConstIntegerValue",
-          "referenceId": "dmg",
-          "value": 10
+          "referenceId": "pa",
+          "value": 5
         }
       ],
       "hasEffects": true,
-      "keywordReferences": []
+      "keywordReferences": [
+        "SIGHT"
+      ]
     },
     "families": [
       2
@@ -35,28 +36,68 @@
     "life": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 385
+      "value": 395
     },
     "movementPoints": {
       "type": "ConstIntegerValue",
       "referenceId": "",
       "value": 3
     },
-    "physicalCriticalDamage": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 50
-    },
-    "physicalCriticalChance": {
-      "type": "ConstIntegerValue",
-      "referenceId": "",
-      "value": 0
-    },
     "actionValue": {
       "type": "ConstIntegerValue",
       "referenceId": "",
-      "value": 10
+      "value": 18
     },
+    "stats": [
+      {
+        "k": 76,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 75,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 17,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 16,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 50
+        }
+      },
+      {
+        "k": 78,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      },
+      {
+        "k": 18,
+        "v": {
+          "type": "ConstIntegerValue",
+          "referenceId": "",
+          "value": 500
+        }
+      }
+    ],
     "actionType": 1,
     "merchantCosts": [
       {
@@ -72,7 +113,16 @@
       "value": 6
     },
     "spells": [
-      114
+      828,
+      307,
+      757,
+      76,
+      466,
+      114,
+      958,
+      641,
+      90039,
+      513
     ],
     "defaultDeck": 695,
     "specificSkills": [
diff --git a/data/json/WeightingProfileDefinition/165.json b/data/json/WeightingProfileDefinition/165.json
deleted file mode 100644
index 6007ae8c4d0620f4a3f9a78a79c39f3203e27848..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/165.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "165",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 165,
-    "weightTable": [
-      {
-        "k": 0,
-        "v": [
-          {
-            "k": 0,
-            "v": 1.0
-          },
-          {
-            "k": 1,
-            "v": 1.0
-          },
-          {
-            "k": 2,
-            "v": 1.0
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "Compagnons",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/308.json b/data/json/WeightingProfileDefinition/308.json
deleted file mode 100644
index 740e9f05cdbdb4804a0134b035742cd64e3d8acd..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/308.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "308",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 308,
-    "weightTable": [
-      {
-        "k": 0,
-        "v": [
-          {
-            "k": 0,
-            "v": 1.0
-          },
-          {
-            "k": 1,
-            "v": 1.0
-          },
-          {
-            "k": 2,
-            "v": 1.0
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "Monstres",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/38.json b/data/json/WeightingProfileDefinition/38.json
deleted file mode 100644
index b39470f187f33e2dff7888e807cd231788cdf090..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/38.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "38",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 38,
-    "weightTable": [
-      {
-        "k": 1,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.99
-          },
-          {
-            "k": 1,
-            "v": 0.01
-          },
-          {
-            "k": 2,
-            "v": 0.0
-          }
-        ]
-      },
-      {
-        "k": 6,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.9
-          },
-          {
-            "k": 1,
-            "v": 0.1
-          },
-          {
-            "k": 2,
-            "v": 0.0
-          }
-        ]
-      },
-      {
-        "k": 9,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.8
-          },
-          {
-            "k": 1,
-            "v": 0.19
-          },
-          {
-            "k": 2,
-            "v": 0.01
-          }
-        ]
-      },
-      {
-        "k": 12,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.69
-          },
-          {
-            "k": 1,
-            "v": 0.29
-          },
-          {
-            "k": 2,
-            "v": 0.02
-          }
-        ]
-      },
-      {
-        "k": 15,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.57
-          },
-          {
-            "k": 1,
-            "v": 0.4
-          },
-          {
-            "k": 2,
-            "v": 0.03
-          }
-        ]
-      },
-      {
-        "k": 17,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.45
-          },
-          {
-            "k": 1,
-            "v": 0.5
-          },
-          {
-            "k": 2,
-            "v": 0.05
-          }
-        ]
-      },
-      {
-        "k": 19,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.35
-          },
-          {
-            "k": 1,
-            "v": 0.55
-          },
-          {
-            "k": 2,
-            "v": 0.1
-          }
-        ]
-      },
-      {
-        "k": 20,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.25
-          },
-          {
-            "k": 1,
-            "v": 0.6
-          },
-          {
-            "k": 2,
-            "v": 0.15
-          }
-        ]
-      },
-      {
-        "k": 22,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.15
-          },
-          {
-            "k": 1,
-            "v": 0.65
-          },
-          {
-            "k": 2,
-            "v": 0.2
-          }
-        ]
-      },
-      {
-        "k": 23,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.05
-          },
-          {
-            "k": 1,
-            "v": 0.7
-          },
-          {
-            "k": 2,
-            "v": 0.25
-          }
-        ]
-      },
-      {
-        "k": 25,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.0
-          },
-          {
-            "k": 1,
-            "v": 0.75
-          },
-          {
-            "k": 2,
-            "v": 0.25
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "Fragments - Sergent",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/716.json b/data/json/WeightingProfileDefinition/716.json
deleted file mode 100644
index ab5362d848aafcd71ea75e1cb7613b3f6b3bbed8..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/716.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "716",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 716,
-    "weightTable": [
-      {
-        "k": 1,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.94
-          },
-          {
-            "k": 1,
-            "v": 0.05
-          },
-          {
-            "k": 2,
-            "v": 0.01
-          }
-        ]
-      },
-      {
-        "k": 6,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.78
-          },
-          {
-            "k": 1,
-            "v": 0.2
-          },
-          {
-            "k": 2,
-            "v": 0.02
-          }
-        ]
-      },
-      {
-        "k": 9,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.65
-          },
-          {
-            "k": 1,
-            "v": 0.31
-          },
-          {
-            "k": 2,
-            "v": 0.04
-          }
-        ]
-      },
-      {
-        "k": 12,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.5
-          },
-          {
-            "k": 1,
-            "v": 0.43
-          },
-          {
-            "k": 2,
-            "v": 0.07
-          }
-        ]
-      },
-      {
-        "k": 15,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.35
-          },
-          {
-            "k": 1,
-            "v": 0.55
-          },
-          {
-            "k": 2,
-            "v": 0.1
-          }
-        ]
-      },
-      {
-        "k": 17,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.2
-          },
-          {
-            "k": 1,
-            "v": 0.65
-          },
-          {
-            "k": 2,
-            "v": 0.15
-          }
-        ]
-      },
-      {
-        "k": 19,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.1
-          },
-          {
-            "k": 1,
-            "v": 0.7
-          },
-          {
-            "k": 2,
-            "v": 0.2
-          }
-        ]
-      },
-      {
-        "k": 20,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.1
-          },
-          {
-            "k": 1,
-            "v": 0.65
-          },
-          {
-            "k": 2,
-            "v": 0.25
-          }
-        ]
-      },
-      {
-        "k": 22,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.05
-          },
-          {
-            "k": 1,
-            "v": 0.65
-          },
-          {
-            "k": 2,
-            "v": 0.3
-          }
-        ]
-      },
-      {
-        "k": 23,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.0
-          },
-          {
-            "k": 1,
-            "v": 0.65
-          },
-          {
-            "k": 2,
-            "v": 0.35
-          }
-        ]
-      },
-      {
-        "k": 25,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.0
-          },
-          {
-            "k": 1,
-            "v": 0.6
-          },
-          {
-            "k": 2,
-            "v": 0.4
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "Fragments - Boss",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/764.json b/data/json/WeightingProfileDefinition/764.json
deleted file mode 100644
index a7160b19599ff1a099e01bc01ca56944e3a16825..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/764.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "764",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 764,
-    "weightTable": [
-      {
-        "k": 0,
-        "v": [
-          {
-            "k": 0,
-            "v": 1.0
-          },
-          {
-            "k": 1,
-            "v": 1.0
-          },
-          {
-            "k": 2,
-            "v": 1.0
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "MARCHAND - Boss",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/861.json b/data/json/WeightingProfileDefinition/861.json
deleted file mode 100644
index 4331f9bef36073712f0b630e8c5f9bde00df6015..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/861.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "861",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 861,
-    "weightTable": [
-      {
-        "k": 1,
-        "v": [
-          {
-            "k": 0,
-            "v": 1.0
-          },
-          {
-            "k": 1,
-            "v": 0.0
-          },
-          {
-            "k": 2,
-            "v": 0.0
-          }
-        ]
-      },
-      {
-        "k": 6,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.95
-          },
-          {
-            "k": 1,
-            "v": 0.05
-          },
-          {
-            "k": 2,
-            "v": 0.0
-          }
-        ]
-      },
-      {
-        "k": 9,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.9
-          },
-          {
-            "k": 1,
-            "v": 0.1
-          },
-          {
-            "k": 2,
-            "v": 0.0
-          }
-        ]
-      },
-      {
-        "k": 12,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.8
-          },
-          {
-            "k": 1,
-            "v": 0.2
-          },
-          {
-            "k": 2,
-            "v": 0.0
-          }
-        ]
-      },
-      {
-        "k": 15,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.7
-          },
-          {
-            "k": 1,
-            "v": 0.29
-          },
-          {
-            "k": 2,
-            "v": 0.01
-          }
-        ]
-      },
-      {
-        "k": 17,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.6
-          },
-          {
-            "k": 1,
-            "v": 0.38
-          },
-          {
-            "k": 2,
-            "v": 0.02
-          }
-        ]
-      },
-      {
-        "k": 19,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.5
-          },
-          {
-            "k": 1,
-            "v": 0.46
-          },
-          {
-            "k": 2,
-            "v": 0.04
-          }
-        ]
-      },
-      {
-        "k": 20,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.4
-          },
-          {
-            "k": 1,
-            "v": 0.54
-          },
-          {
-            "k": 2,
-            "v": 0.06
-          }
-        ]
-      },
-      {
-        "k": 22,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.3
-          },
-          {
-            "k": 1,
-            "v": 0.62
-          },
-          {
-            "k": 2,
-            "v": 0.08
-          }
-        ]
-      },
-      {
-        "k": 23,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.2
-          },
-          {
-            "k": 1,
-            "v": 0.7
-          },
-          {
-            "k": 2,
-            "v": 0.1
-          }
-        ]
-      },
-      {
-        "k": 25,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.1
-          },
-          {
-            "k": 1,
-            "v": 0.75
-          },
-          {
-            "k": 2,
-            "v": 0.15
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "Fragments - Trouffion",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/941.json b/data/json/WeightingProfileDefinition/941.json
deleted file mode 100644
index 4c33d0ebc155393fc6137bbc18b882d5848b5292..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/941.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "941",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 941,
-    "weightTable": [
-      {
-        "k": 0,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.7
-          },
-          {
-            "k": 1,
-            "v": 0.2
-          },
-          {
-            "k": 2,
-            "v": 0.1
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "MARCHAND - Sergent",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/WeightingProfileDefinition/990.json b/data/json/WeightingProfileDefinition/990.json
deleted file mode 100644
index 446231e92e0c8f81e5875e5539889ff0643523ee..0000000000000000000000000000000000000000
--- a/data/json/WeightingProfileDefinition/990.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "m_FileID": 0,
-  "m_Name": "990",
-  "m_jsonRepresentation": {
-    "type": "WeightingProfileDefinition",
-    "id": 990,
-    "weightTable": [
-      {
-        "k": 0,
-        "v": [
-          {
-            "k": 0,
-            "v": 0.7
-          },
-          {
-            "k": 1,
-            "v": 0.2
-          },
-          {
-            "k": 2,
-            "v": 0.1
-          }
-        ]
-      }
-    ]
-  },
-  "m_displayName": "MARCHAND - Trouffion",
-  "m_availability": 3
-}
\ No newline at end of file
diff --git a/data/json/dico/Achievements.json b/data/json/dico/Achievements.json
index 43234a5ca0c1b33680e84b84d12df3d8ebf37ef0..3a801c0d649583c06b33aa63ffaed245922f307f 100644
--- a/data/json/dico/Achievements.json
+++ b/data/json/dico/Achievements.json
@@ -1,5 +1,5 @@
 {
-  "480": "Achievements",
+  "1036": "Achievements",
   "8131": "Terminer le chapitre VIII",
   "28883": "Terminer le chapitre VIII",
   "30431": "Aider Vorti à piller le Chef du Clan",
@@ -52,7 +52,6 @@
   "36310": "Achievement 7",
   "46976": "Réussir 50 challenges",
   "79659": "Aider Sir Hector à récupérer son équipement",
-  "50866": "Vaincre 50 ennemis",
   "29717": "Tuer 30 Bataillons Chuchoteurs",
   "64125": "Vaincre 30 sbires du clan Pira\u0027Bwork",
   "15751": "Compléter le Chapitre III",
@@ -88,7 +87,6 @@
   "50868": "Terminer 10 fois le donjon",
   "15427": "Vaincre le Patriarche",
   "83478": "Terminer le chapitre II",
-  "96087": "Vaincre 50 ennemis",
   "63882": "TODO - Achievement Spécifique Secret",
   "18613": "Vaincre un boss Chafer sans perdre un seul allié en Argent ou plus",
   "5629": "Avoir été immobilisé 10 fois",
@@ -310,7 +308,6 @@
   "27643": "Compléter le chapitre V en Bronze",
   "50771": "Terminer le chapitre I en Bronze",
   "41407": "Faire un COUP DE GRÂCE avec Alibert",
-  "44177": "Vaincre 50 ennemis",
   "34409": "Mourir sur un piège Chafer",
   "66583": "Vaincre un gardien Pira\u0027Bwork sans invoquer de compagnons",
   "77954": "Vaincre le Bworkdog en premier",
@@ -435,7 +432,6 @@
   "18155": "Niels Laren sous couverture doit achever tous ses alliés",
   "56023": "Terminer le chapitre VI",
   "88171": "Achever Le Chevalier de Parme avec Cochonnette et gagner le combat",
-  "26309": "Terminer le chapitre I",
   "3124": "Terminer le chapitre IX",
   "27802": "Compléter le Chapitre V",
   "51294": "Compléter le Chapitre VII",
@@ -478,5 +474,11 @@
   "60463": "Terminer le chapitre I en Argent",
   "99905": "Terminer 10 fois le donjon",
   "95570": "Compléter le chapitre X en Argent",
-  "19490": "[WIP] Spécifique 1"
+  "19490": "[WIP] Spécifique 1",
+  "75463": "Enrager 5 fois un boss en achevant un autre Bwork",
+  "34479": "Terminer le tutoriel",
+  "4805": "TODO",
+  "16066": "TODO",
+  "85274": "TODO",
+  "35212": "TODO"
 }
\ No newline at end of file
diff --git a/data/json/dico/Adventures.json b/data/json/dico/Adventures.json
index 211745e83e619710cb7eb8a7b16ef66daf8a6031..1f722b2c6dcd88001ef7ed287c86d37c4e060c79 100644
--- a/data/json/dico/Adventures.json
+++ b/data/json/dico/Adventures.json
@@ -1,5 +1,5 @@
 {
-  "187": "Adventures",
+  "1036": "Adventures",
   "43900": "Abandonner",
   "41984": "Salle",
   "96787": "Donjon Chafer",
@@ -170,20 +170,35 @@
   "71288": "Bronze",
   "83428": "Argent",
   "84047": "Or",
-  "98332": "",
+  "98332": "Les âmes errantes veillent à troubler l\u0027avancée des vivants qui oseraient s\u0027enfoncer dans la crypte.",
   "69801": "",
-  "59162": "Chafer_silver",
-  "56758": "Chafer_gold",
-  "90260": "Chafer_bronze",
-  "37720": "Les âmes commencent à affluer jusqu’au Grignoteur.",
-  "88411": "Les âmes affluent jusqu’au Grignoteur et emportent les aventuriers qu’elles croisent.\n\\---\nLes aventuriers sont attirés vers la mort.",
-  "92082": "Les âmes commencent à affluer jusqu’au Grignoteur.",
-  "52057": "Les âmes affluent jusqu’au Grignoteur et emportent les aventuriers qu’elles croisent.\n\\---\nLes aventuriers sont attirés vers la mort.",
-  "44943": "Le volcan est réveillé et se déchaine régulièrement.\n\\---\nL’entente entre les bworks commence un tant soit peu à ressembler à un groupe.",
-  "34606": "Le vacarme ambiant commence à réveiller le volcan.\n\\---\nLes Bworks se disputent souvent au point qu’ils s’enragent avant l’arrivé de visiteur.",
-  "54848": "Le volcan est réveillé et se déchaine régulièrement.\n\\---\nL’entente entre les bworks commence un tant soit peu à ressembler à un groupe.",
-  "6552": "Le vacarme ambiant commence à réveiller le volcan.\n\\---\nLes Bworks se disputent souvent au point qu’ils s’enragent avant l’arrivé de visiteur.",
-  "65243": "Les cochons s’exercent avec plus d’ardeur.",
-  "98745": "L’entraînement des cochons est plus intensif.\n\\---\nLes rangs de l’armée se gonflent des créations de l\u0027Impératrice.",
-  "21314": "Les cochons s’exercent avec plus d’ardeur."
+  "90260": "Les âmes errantes veillent à troubler l\u0027avancée des vivants qui oseraient s\u0027enfoncer dans la crypte.",
+  "37720": "Des âmes plus anciennes ont été réveillées et de l\u0027eau s\u0027infiltre dans la crypte.",
+  "88411": "Des revenants glacés font leurs apparitions au milieu des nombreux mécanismes maudits.",
+  "92082": "Des âmes plus anciennes ont été réveillées et de l\u0027eau s\u0027infiltre dans la crypte.",
+  "52057": "Des revenants glacés font leurs apparitions au milieu des nombreux mécanismes maudits.",
+  "44943": "Suite au réveil du volcan, un drôle de culte bwork fait son apparition.\\v\\_\nDes coulées de lave envahissent le paysage.",
+  "34606": "Les pirates rentrent de la mer et ramènent avec eux richesses et nourriture.\\v\\_\nLe volcan se réveille et commence ⣴ransformer l\u0027environnement.",
+  "54848": "Suite au réveil du volcan, un drôle de culte bwork fait son apparition.\\v\\_\nDes coulées de lave envahissent le paysage.",
+  "6552": "Les pirates rentrent de la mer et ramènent avec eux richesses et nourriture.\\v\\_\nLe volcan se réveille et commence à transformer l\u0027environnement.",
+  "65243": "Les ninjas de l\u0027Impératrice viennent grossir les rangs de l\u0027armée. Un entraînement plus intensif à été mis en place.",
+  "98745": "Le personnel de cuisine de l\u0027Impératrice s\u0027est mobilisé et des pièges ont été placés afin de ralentir toute progression non désirée.",
+  "21314": "Les ninjas de l\u0027Impératrice viennent grossir les rangs de l\u0027armée. Un entraînement plus intensif à été mis en place.",
+  "38781": "Le personnel de cuisine de l\u0027Impératrice s\u0027est mobilisé et des pièges ont été placés afin de ralentir toute progression non désirée.",
+  "42302": "Les tombes sont de plus en plus attirantes à mesure que les âmes sont libérées de leurs enveloppes.",
+  "35821": "L\u0027eau qui infiltre la crypte semble soigner les âmes en perdition.",
+  "49068": "Les bworks aiment se disputer, il ne faut pas grand chose pour les enrager.",
+  "42981": "La colère du volcan s\u0027intensifie, les éruptions deviennent plus régulières et imprévisibles.",
+  "25698": "Les grondements du volcan empêchent quiconque de tenir en équilibre.",
+  "21750": "Les cochons sont très territoriaux, ils n\u0027hésiteront pas à faire payer le prix fort de toute intrusion.",
+  "65046": "L\u0027empereur a fait installer des mannequins d\u0027entraînement afin d\u0027endurcir ses troupes.",
+  "52962": "Les mannequins d\u0027entraînement ont été améliorés et peuvent maintenant s\u0027en prendre aux intrus.",
+  "3288": "Les bworks aiment se disputer, il ne faut pas grand chose pour les enrager.",
+  "85579": "La colère du volcan s\u0027intensifie, les éruptions deviennet plus régulières et imprévisibles.",
+  "54705": "Les grondements du volcan empêchent quiconque de tenir en équilibre.",
+  "38384": "Les tombes sont de plus en plus attirantes à mesure que les âmes sont libérées de leurs enveloppes.",
+  "72602": "L\u0027eau qui infiltre la crypte semble soigner les âmes en perdition.",
+  "21517": "Les cochons sont très territoriaux, ils n\u0027hésiteront pas à faire payer le prix fort de toute intrusion.",
+  "39207": "L\u0027empereur a fait installer des mannequins d\u0027entraînement afin d\u0027endurcir ses troupes.",
+  "18489": "Les mannequins d\u0027entraînement ont été améliorés et peuvent maintenant s\u0027en prendre aux intrus."
 }
\ No newline at end of file
diff --git a/data/json/dico/Application.json b/data/json/dico/Application.json
index 48281f342919fed41b16ad0769e128cd6ffae54e..ce09f551e7e3dc14beae4bc78fd6bce8a445705b 100644
--- a/data/json/dico/Application.json
+++ b/data/json/dico/Application.json
@@ -1,5 +1,5 @@
 {
-  "217": "Application",
+  "1036": "Application",
   "42418": "Réessayer",
   "76520": "Chargement",
   "35500": "Bienvenue sur WAVEN !",
@@ -29,13 +29,13 @@
   "76361": "Êtes-vous sûr(e) de vouloir supprimer ce Deck ?",
   "66030": "Équipe sélectionnée : {0}",
   "64793": "Aucune équipe valide pour ce dieu",
-  "26234": "Un Deck doit posséder 8 sorts et 4 compagnons.",
+  "26234": "Un Deck doit posséder au moins 9 sorts dont 4 sorts d\u0027arme.",
   "95690": "Deck non valide",
   "63564": "Recherche {0, plural, one[d\u0027un joueur] other[de joueurs] }",
   "32864": "Training",
-  "98462": "1\u003csize\u003d75%\u003eVS\u003c/size\u003e1",
-  "16247": "\u003csize\u003d23\u003earène\u003c/size\u003e\nKanojedo",
-  "48842": "\u003csize\u003d23\u003earène\u003c/size\u003e\nBonta",
+  "98462": "Training",
+  "16247": "Training\nKanojedo",
+  "48842": "Training\nKanojedo\nBonta",
   "49285": "En ligne",
   "31324": "Absent(e)",
   "91881": "Occupé(e)",
@@ -79,7 +79,7 @@
   "5718": "Invitation envoyée",
   "9514": "L\u0027invitation n\u0027a pas aboutie.",
   "26511": "Invitation en cours d\u0027envoi",
-  "54817": "\u003csize\u003d23\u003earène\u003c/size\u003e\nNains",
+  "54817": "Invitation en cours d\u0027envoi\nNains",
   "38048": "Impossible de récupérer la liste d\u0027amis.",
   "10810": "Impossible de récupérer les invitations en attente.",
   "37655": "En combat",
@@ -92,7 +92,7 @@
   "15358": "Ratio",
   "37056": "Total",
   "28788": "Vous devez faire au moins un combat pour avoir des statistiques avec cette classe.",
-  "22574": "2\u003csize\u003d75%\u003eVS\u003c/size\u003e2",
+  "22574": "Vous devez faire au moins un combat pour avoir des statistiques avec cette classe.",
   "83979": "GO",
   "47933": "Chercher un ami",
   "59137": "Amis - ({0}/{1})",
@@ -215,5 +215,15 @@
   "26653": "Une erreur est survenue",
   "37177": "L\u0027inventaire de ce joueur est surchargé.",
   "33319": "Votre inventaire est surchargé.",
-  "66809": "Niv."
+  "66809": "Niv.",
+  "41527": "Le joueur n\u0027est pas disponible.",
+  "54755": "",
+  "88773": "Tutoriel",
+  "63864": "",
+  "94470": "{0} vous propose une quête infinie.",
+  "71990": "Ce joueur a encore des choix de dons a faire.",
+  "65173": "Vous avez encore des choix de dons a faire.",
+  "28653": "Confirmer",
+  "33228": "Effet",
+  "24760": ""
 }
\ No newline at end of file
diff --git a/data/json/dico/Challenges.json b/data/json/dico/Challenges.json
index e5c301ce5219282a2fa9ff2413cf21ac095d3f52..47d6de3f89198c9e16412ea7ddb6ae4eb5b6fade 100644
--- a/data/json/dico/Challenges.json
+++ b/data/json/dico/Challenges.json
@@ -1,15 +1,13 @@
 {
-  "52": "Challenges",
+  "1036": "Challenges",
   "7223": "Des amis pour la vie",
   "83298": "Aucun héros allié ne doit mourir.\n\nRécompense : +25% aux drops des monstres.",
   "38670": "Solitaire",
-  "12044": "Aucun membre de votre équipe ne doit terminer son tour sur une case adjacente à un personnage allié.\n\nRécompense : +40% aux drops des monstres.",
+  "12044": "Aucun membre de votre équipe ne doit terminer son tour sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un personnage allié.\n\nRécompense : +40% aux drops des monstres.",
   "54709": "Ordonné",
   "47408": "Les personnages adverses doivent être éliminés dans l\u0027ordre indiqué par le jeu.\n\nRécompense : +60% aux drops des monstres.",
   "11477": "Nomade",
   "85470": "Vos personnages doivent se déplacer à chaque tour de jeu.\n\nRécompense : +30% aux drops des monstres.",
-  "62666": "Sorciers",
-  "54444": "Chaque joueur allié doit avoir lancé au moins dix sorts dans le combat.\n\nRécompense: +30% aux butins des monstres.",
   "11528": "Équilibré",
   "36635": "Tous les héros alliés doivent être en vie à la fin du combat et leurs points de vie doivent être compris en 280 et 320.\n\nRécompense: +80% aux drops des monstres.",
   "36602": "Paternalisme",
@@ -31,7 +29,7 @@
   "83091": "Par les armes... héroïquement",
   "14361": "Les personnages adverses doivent être achevés par l\u0027attaque d\u0027un héros.\n\nRécompense : +60% aux drops des monstres.",
   "62413": "Statique",
-  "65083": "Aucun de vos personnages ne doit dépenser tous ses PM à chaque tour de jeu.\n\nRécompense : +30% aux drops des monstres.",
+  "65083": "Aucun de vos personnages ne doit dépenser tous ses {%PM} à chaque tour de jeu.\n\nRécompense : +30% aux drops des monstres.",
   "58513": "Frères d\u0027Armes",
   "13315": "Vous ne devez pas invoquer plus d\u0027un compagnon pendant ce combat.\n\nRécompense : +60% aux drops des monstres.",
   "38844": "D\u0027une Pierre Deux Coups",
@@ -39,7 +37,7 @@
   "13055": "Traqueur",
   "546": "Après avoir infligé des dégâts à un adversaire, vous devez l\u0027achever avant d\u0027en blesser un autre.\n\nRécompense : +45% aux drops des monstres.",
   "82542": "Escouade",
-  "57934": "Vos personnages doivent toujours finir leur tour sur une case autour d\u0027un allié.\n\nRécompense : +25% aux drops des monstres.",
+  "57934": "Vos personnages doivent toujours finir leur tour sur une case autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un allié.\n\nRécompense : +25% aux drops des monstres.",
   "74223": "Imprévisible",
   "82703": "Vous ne devez infliger des dégâts qu\u0027à l\u0027adversaire ciblé ce tour.\n\nRécompense : +80% aux drops des monstres.",
   "37627": "Chacun le Sien",
@@ -49,6 +47,5 @@
   "23421": "Escorte",
   "87926": "Le héros ciblé ne doit pas mourir.\n\nRécompense : +15% aux drops des monstres.",
   "81490": "Pacifiste",
-  "59170": "Le joueur ciblé ne doit pas achever d\u0027adversaire.\n\nRécompense : +20% aux drops des monstres.",
-  "87118": ""
+  "59170": "Le joueur ciblé ne doit pas achever d\u0027adversaire.\n\nRécompense : +20% aux drops des monstres."
 }
\ No newline at end of file
diff --git a/data/json/dico/CharacterSkins.json b/data/json/dico/CharacterSkins.json
index 329ca9250bb8b4cf028076cde7a4739ae6398666..2aada770c7fab9ce2ad5b2c84ad53d64eb8b6cd8 100644
--- a/data/json/dico/CharacterSkins.json
+++ b/data/json/dico/CharacterSkins.json
@@ -1,5 +1,5 @@
 {
-  "1357": "CharacterSkins",
+  "1036": "CharacterSkins",
   "76074": "Alchimiste Armurée",
   "96392": "Placeholder",
   "12853": "Corbeau Noir",
@@ -266,7 +266,7 @@
   "44544": "Minotoror",
   "82833": "Kasimordo",
   "82104": "???",
-  "66482": "???",
+  "66482": "Tofu Rose",
   "26086": "Tofuventail",
   "74519": "Bworkakorn",
   "43472": "Protecteur Sacré",
@@ -461,7 +461,6 @@
   "59380": "Baron Roméro",
   "49625": "Creuzard",
   "41094": "Ecafripon",
-  "42122": "Ecafripon",
   "71729": "Colporteur",
   "9736": "Colporteur",
   "79028": "Colporteur",
@@ -586,44 +585,44 @@
   "6046": "Ombre Glacée",
   "45273": "Spectre",
   "73536": "Tas d\u0027Os",
-  "17121": "Les Osamodas Dompteur d\u0027Épines ont une tenue de base mettant en valeur leurs belles épines orangées.",
-  "81965": "Les Cras utilisant un Arc Piven arborent de base cette tenue claire et légère rappelant la pureté de la neige et le froid mordant de la glace.",
-  "27422": "Les Cras utilisant un Arc Piven arborent de base cette tenue claire et légère rappelant la pureté de la neige et le froid mordant de la glace.",
-  "93487": "Les Osamodas Dompteur d\u0027Épines ont une tenue de base mettant en valeur leurs belles épines orangées.",
-  "1135": "Les Iops Justelame Brutale sont habillés avec une tenue basique représentative de leur classe permettant de les repérer au premier coup d\u0027oeil.",
+  "17121": "",
+  "81965": "",
+  "27422": "",
+  "93487": "",
+  "1135": "",
   "54032": "",
-  "21315": "Son amour des tesla est si extrême qu\u0027il en est devenu une...",
-  "93180": "Les Iops Glaive Stalaktoss ont une tenue de base composée de givre qui glace le sang de leurs ennemis.",
-  "96275": "Les Eniripsas Ambre Tamashi sont reconnaissables à leur tenue de base et le masque caractéristique qui leur confère un style très sauvage.",
-  "18406": "Les Eniripsas Gemme Déphasante ont une tenue de base spéciale leur permettant de se controller tout en évitant de se retrouver nus à chaque déphasage.",
-  "79917": "Les Eniripsas Scalpel de l\u0027Apostruker portent une tenue d\u0027infirmier de base qui fait peur aux ennemis sur le champ de bataille... et aux alliés aussi !",
+  "21315": "",
+  "93180": "",
+  "96275": "",
+  "18406": "",
+  "79917": "",
   "96081": "Colombe",
   "53029": "",
-  "94233": "Les Eniripsas Gemme Déphasante ont une tenue de base spéciale leur permettant de se controler tout en évitant de se retrouver nus à chaque déphasage.",
-  "4790": "Les Eniripsas Lame Voracius arborent une tenue basique rubis qui fait ressortir leur teint livide et rappelle le précieux liquide dont ils aime se délecter.",
-  "83386": "Les Eniripsas Lame Voracius arborent une tenue basique rubis qui fait ressortir leur teint livide et rappelle le précieux liquide dont ils aime se délecter.",
-  "7659": "Les Eniripsas Pinceau Kokoro en passe de devenir maîtres de leur pinceau s\u0027habillent avec une tenue de base très sobre faisant bien ressortir les tâches de peinture.",
-  "17432": "Les Eniripsas Pinceau Kokoro en passe de devenir maîtres de leur pinceau s\u0027habillent avec une tenue de base très sobre faisant bien ressortir les tâches de peinture.",
-  "58037": "Les Cras Bunelame, reconnaissables grâce au boomerang sur leur tête, portent cette tenue de base à la limite de l\u0027exhibitionnisme.",
-  "81056": "Les Cras Bunelame, reconnaissables grâce au boomerang sur leur tête, portent cette tenue de base à la limite de l\u0027exhibitionnisme.",
-  "6327": "Les Cras Expingole aiment les mécanismes et les vêtements sophistiqués, alors cette tenue basique comble toutes leurs attentes vestimentaires.",
-  "63119": "Les Cras Expingole aiment les mécanismes et les vêtements sophistiqués, alors cette tenue basique comble toutes leurs attentes vestimentaires.",
-  "62282": "Les Cras Shiru Shaden portent cette tenue de base, quelque peu conditionnée par leurs années d\u0027entrainement au lancer de shurikens.",
-  "94010": "Les Cras Shiru Shaden portent cette tenue de base, quelque peu conditionnée par leurs années d\u0027entrainement au lancer de shurikens.",
-  "17443": "Les Cras Voldorak Vo en formation utilisent cette tenue de base pour se fondre dans la nature et ainsi attaquer discrétement.",
-  "58606": "Les Cras Voldorak Vo en formation utilisent cette tenue de base pour se fondre dans la nature et ainsi attaquer discrétement.",
-  "59348": "Les Eniripsas Ambre Tamashi sont reconnaissables à leur tenue de base et le masque caractéristique qui leur confère un style très sauvage.",
-  "21071": "Les Eniripsas Scalpel de l\u0027Apostruker portent une tenue d\u0027infirmier de base qui fait peur aux ennemis sur le champ de bataille... et aux alliés aussi !",
-  "637": "Les Iops Bouvaloir Orok portent une tenue de base assortie avec leur bouclier.",
-  "46514": "Les Iops Bouvaloir Orok portent une tenue de base assortie avec leur bouclier.",
-  "25507": "Les Iop Flamboyante Kasaï sont tout de rouge vêtus dans une tenue de base leur donnant un style tout feu, tout flamme !",
-  "48117": "Les Osamodas Pâtre Laineux ont utilisé la laine de leurs Bouftous pour se confectionner une tenue basique parfaite pour trainer dans les prairies.",
-  "77936": "Parés de leur chapeau de paille, les Osamodas Maître Froussard ont adopté une tenue de base paysanne ressemblant à leurs Flaqueux.",
-  "7135": "Quoi de mieux qu\u0027une tenue de base en plumes de Tofu pour les Osamodas Éleveur Zélé ?",
-  "95182": "Quoi de mieux qu\u0027une tenue de base en plumes de Tofu pour les Osamodas Éleveur Zélé ?",
-  "91050": "Les Osamodas Dresseur Rocailleux arborent une tenue basique ornée de pierres leur donnant un look fort et sauvage.",
-  "80978": "S\u0027immoler par le feu ! Voilà un style parfait pour un Sacrieur un peu trop tête brûlée !",
-  "43963": "Tout le monde disait de lui que c\u0027était un boulet, alors il a fini par en faire un style.",
+  "94233": "",
+  "4790": "",
+  "83386": "",
+  "7659": "",
+  "17432": "",
+  "58037": "",
+  "81056": "",
+  "6327": "",
+  "63119": "",
+  "62282": "",
+  "94010": "",
+  "17443": "",
+  "58606": "",
+  "59348": "",
+  "21071": "",
+  "637": "",
+  "46514": "",
+  "25507": "",
+  "48117": "",
+  "77936": "",
+  "7135": "",
+  "95182": "",
+  "91050": "",
+  "80978": "",
+  "43963": "",
   "27738": "",
   "70664": "Paco",
   "40463": "",
@@ -657,20 +656,20 @@
   "72584": "",
   "86979": "Tika",
   "49826": "",
-  "56864": "Les Iop Flamboyante Kasaï sont tout de rouge vêtus dans une tenue de base leur donnant un style tout feu, tout flamme !",
+  "56864": "",
   "94611": "Fontaine de Lave",
   "77197": "",
   "25931": "Jon Kriz",
   "70510": "",
   "8891": "Poche de Lave",
   "432": "",
-  "96873": "Les Iops Glaive Stalaktoss ont une tenue de base composée de givre qui glace le sang de leurs ennemis.",
-  "64611": "Les Iops Justelame Brutale sont habillés avec une tenue basique représentative de leur classe permettant de les repérer au premier coup d\u0027oeil.",
-  "4916": "Les Iops Lamarguedon Spectral utilisent une tenue de base à la fois sombre et fantomatique abritant des âmes égarées.",
-  "68905": "Les Iops Lamarguedon Spectral utilisent une tenue de base à la fois sombre et fantomatique abritant des âmes égarées.",
-  "81158": "Les Osamodas Dresseur Rocailleux arborent une tenue basique ornée de pierres leur donnant un look fort et sauvage.",
-  "6342": "Parés de leur chapeau de paille, les Osamodas Maître Froussard ont adopté une tenue de base paysanne ressemblant à leurs Flaqueux.",
-  "26623": "Les Osamodas Pâtre Laineux ont utilisé la laine de leurs Bouftous pour se confectionner une tenue basique parfaite pour trainer dans les prairies.",
+  "96873": "",
+  "64611": "",
+  "4916": "",
+  "68905": "",
+  "81158": "",
+  "6342": "",
+  "26623": "",
   "95494": "",
   "55704": "",
   "29557": "Crâne",
@@ -716,13 +715,13 @@
   "39053": "",
   "5679": "Tombe Maudite",
   "44209": "",
-  "19247": "3B",
+  "19247": "Jamon le Shihan",
   "79135": "",
   "72888": "???",
   "97657": "",
-  "76538": "Hochos Bochos",
+  "76538": "Kasimordo",
   "70248": "",
-  "59079": "San Toku",
+  "59079": "Crogneur",
   "56135": "",
   "43324": "Obléro",
   "38940": "",
@@ -748,35 +747,35 @@
   "38289": "",
   "34242": "Evideur",
   "39426": "",
-  "63190": "Oscargne",
+  "63190": "Arbatarba Pikaross",
   "4966": "",
-  "19378": "Mossaka",
+  "19378": "Picoss Pikaross",
   "52958": "",
-  "60054": "Castresse la Frigide",
+  "60054": "Châtreuse Pikaross",
   "24056": "",
-  "12198": "Bardos Le Désosseur",
+  "12198": "Blockmort Surin",
   "73544": "",
-  "99161": "Kiro",
+  "99161": "Arbatarba Surin",
   "56677": "",
   "24738": "Proctoss",
   "38006": "",
-  "50453": "Hocho La Dépeceuse",
+  "50453": "Châtreuse surin",
   "97667": "",
-  "34222": "Krouktos",
+  "34222": "Blockmort Pikaross",
   "97797": "",
-  "81344": "Avorton",
+  "81344": "Avorton Pikaross",
   "14821": "",
-  "76551": "Aligore",
+  "76551": "Kasimordo Pikaross",
   "13192": "",
-  "6353": "Ninjadine",
+  "6353": "Coppa le Copain Ninja",
   "91957": "",
   "34026": "Comte Mélankar",
   "39563": "",
-  "4309": "Bolos Le Niais",
+  "4309": "Crogneur Pikaross",
   "27647": "",
-  "33570": "Lester",
+  "33570": "Avorton Surin",
   "2248": "",
-  "69313": "Gnokoss",
+  "69313": "Proctoss Pikaross",
   "75097": "",
   "49187": "Comte Moross",
   "5636": "",
@@ -804,58 +803,58 @@
   "99231": "",
   "13048": "Gelbibi Multigout",
   "7990": "",
-  "96396": "2A",
+  "96396": "1",
   "27207": "",
-  "57607": "1A",
+  "57607": "Jamon le Sanguinaire",
   "83762": "",
   "68447": "Liche Azundor",
   "99210": "",
   "9226": "Liche Horrorthon",
   "82008": "",
-  "36824": "Grack Torrance",
+  "36824": "Guerrier Boudeur Boucher",
   "23574": "",
-  "33638": "Carnibal Lecter",
+  "33638": "Graton Boucher",
   "57220": "",
-  "98091": "Yoshigrouitsu",
+  "98091": "Soldat Tripoux Ninja",
   "91761": "",
-  "61714": "Orochimagrouik",
+  "61714": "Guerrier Boudeur Ninja",
   "65951": "",
-  "85493": "Pigsaw",
+  "85493": "Soldat Tripoux Boucher",
   "13042": "",
-  "59872": "Gralex Lelarge",
+  "59872": "Coppa le Copain Boucher",
   "79647": "",
-  "13299": "Grouik Smoke",
+  "13299": "Graton",
   "91126": "",
-  "98409": "Grouyu Hayabusa",
+  "98409": "Instructeur Cochon Ninja",
   "29105": "",
-  "62663": "Porman Bates",
+  "62663": "Instructeur Cochon Boucher",
   "75655": "",
-  "61674": "Shrouidder",
+  "61674": "Disciple Cochonnet",
   "11537": "",
-  "79331": "Maki Gengrouisai",
+  "79331": "Mortadella Ninja",
   "8538": "",
-  "10933": "Freddy Grouiger",
+  "10933": "Disciple Cochonnet Boucher",
   "89032": "",
-  "53677": "Grannie Wilkes",
+  "53677": "Mortadella Boucher",
   "3430": "",
   "78187": "",
   "43069": "",
   "89867": "",
-  "16184": "CharacterSkins",
+  "16184": "6",
   "63240": "",
-  "63696": "CharacterSkins",
+  "63696": "7",
   "56558": "",
-  "19109": "CharacterSkins",
+  "19109": "8",
   "27049": "",
   "21021": "Bouftou",
   "26467": "",
   "93381": "Bouftou",
   "64442": "",
-  "23433": "CharacterSkins",
+  "23433": "6",
   "89319": "",
   "31999": "Bouftou",
   "62658": "",
-  "98436": "CharacterSkins",
+  "98436": "8",
   "21875": "",
   "24027": "Bouflonne",
   "10448": "",
@@ -871,13 +870,13 @@
   "3270": "",
   "48165": "Bouflonne",
   "42161": "",
-  "75408": "CharacterSkins",
+  "75408": "5",
   "22462": "",
-  "35622": "CharacterSkins",
+  "35622": "7",
   "34122": "",
   "45819": "Chef de Guerre",
   "68957": "",
-  "56637": "CharacterSkins",
+  "56637": "5",
   "98700": "",
   "48531": "Bouftou",
   "56878": "",
@@ -895,7 +894,7 @@
   "76267": "",
   "88858": "Glaive Stalaktoss",
   "89211": "",
-  "35800": "???",
+  "35800": "Synchronisateur Tako",
   "2038": "",
   "33974": "Arc Piven",
   "37131": "",
@@ -1085,22 +1084,18 @@
   "12232": "",
   "43872": "Berger Flaqueux",
   "56667": "",
-  "30763": "Bouvaloir Orok",
-  "5651": "Les Iops Bouvaloir Orok portent une tenue de base assortie avec leur bouclier.",
-  "7159": "Bouvaloir Orok",
-  "81995": "Les Iops Bouvaloir Orok portent une tenue de base assortie avec leur bouclier.",
   "61689": "Bworkokak",
   "58253": "???",
   "19712": "",
   "31472": "???",
   "80030": "",
-  "98957": "???",
+  "98957": "Tas d\u0027Os Pikaross",
   "98325": "",
   "29623": "???",
   "87494": "",
   "95852": "???",
   "35001": "",
-  "96024": "???",
+  "96024": "Régulant Gurpapa",
   "2962": "",
   "84610": "???",
   "75130": "",
@@ -1112,13 +1107,13 @@
   "63274": "",
   "70682": "???",
   "65786": "",
-  "95652": "???",
+  "95652": "Aiguille Pikuxala",
   "89227": "",
   "73079": "???",
   "82678": "",
-  "35454": "???",
+  "35454": "Bworkette Pirate",
   "17418": "",
-  "48731": "???",
+  "48731": "Sabliaton Jikan",
   "97512": "",
   "6743": "Âme Volcanique",
   "86483": "",
@@ -1128,15 +1123,15 @@
   "42641": "",
   "20608": "???",
   "75817": "",
-  "76392": "???",
+  "76392": "Synchronisateur Tako",
   "8153": "",
   "52200": "Draconar",
   "15671": "",
   "20372": "???",
   "39092": "",
-  "52785": "???",
+  "52785": "Aiguille Pikuxala",
   "12617": "",
-  "59586": "???",
+  "59586": "Catalysateur Pramium",
   "5635": "",
   "91266": "???",
   "94531": "",
@@ -1146,11 +1141,11 @@
   "48041": "",
   "65143": "???",
   "31031": "",
-  "79484": "???",
+  "79484": "Régulant Gurpapa",
   "55754": "",
-  "95763": "???",
+  "95763": "Poulpanov",
   "1283": "",
-  "41635": "???",
+  "41635": "Bodgapoulpe",
   "3290": "",
   "4029": "???",
   "85444": "",
@@ -1164,35 +1159,33 @@
   "38974": "",
   "55821": "???",
   "5354": "",
-  "28928": "???",
+  "28928": "Survivant",
   "77777": "",
-  "5082": "???",
+  "5082": "Xelocube Vide",
   "91762": "",
-  "17046": "???",
-  "22032": "",
   "60322": "???",
   "85018": "",
-  "5401": "???",
+  "5401": "Catalysateur Pramium",
   "5172": "",
-  "18944": "???",
+  "18944": "Régulant Gurpapa",
   "91852": "",
   "53006": "???",
   "48913": "",
-  "42806": "???",
+  "42806": "Bworkette",
   "17094": "",
-  "86534": "???",
+  "86534": "Régulant Gurpapa",
   "85592": "",
   "29380": "???",
   "1390": "",
-  "29434": "???",
+  "29434": "Fran\u0027Eau",
   "73691": "",
   "87990": "???",
   "26429": "",
-  "34998": "???",
+  "34998": "Bwork Parle-Lave Pirate",
   "52241": "",
-  "39921": "???",
+  "39921": "Xelocube Solaire",
   "78492": "",
-  "85900": "???",
+  "85900": "Larbin Monté Pirate",
   "56865": "",
   "93309": "???",
   "16016": "",
@@ -1200,25 +1193,25 @@
   "27507": "",
   "95591": "Âme Céleste",
   "38900": "",
-  "52882": "???",
+  "52882": "Livre Shushu",
   "95398": "",
-  "59887": "???",
+  "59887": "Bworkakorn Pirate",
   "76642": "",
   "98457": "???",
   "16833": "",
   "1638": "???",
   "2081": "",
-  "85624": "???",
+  "85624": "Parle-Lave Volcano\u0027culte",
   "41485": "",
-  "71636": "???",
+  "71636": "Sabliaton Jikan",
   "3259": "",
   "31079": "???",
   "38479": "",
-  "97331": "???",
+  "97331": "Karab",
   "31975": "",
   "92314": "Dragonnet Chromatique",
   "84883": "",
-  "21433": "???",
+  "21433": "Gro Bwork Volcano\u0027culte",
   "22716": "",
   "57500": "Serviteur Draconique",
   "95277": "",
@@ -1226,15 +1219,15 @@
   "47425": "",
   "67139": "???",
   "45270": "",
-  "46490": "???",
+  "46490": "Larbin Pirate",
   "19921": "",
   "96639": "???",
   "9544": "",
   "41660": "???",
   "70001": "",
-  "28414": "???",
+  "28414": "Bworkakorn Volcano\u0027culte",
   "70311": "",
-  "52146": "???",
+  "52146": "Aiguille Pikuxala",
   "12797": "",
   "72573": "???",
   "23815": "",
@@ -1248,21 +1241,21 @@
   "51973": "",
   "95110": "???",
   "348": "",
-  "87012": "???",
+  "87012": "Ploutrozorus",
   "80323": "",
   "94298": "???",
   "91100": "",
   "3425": "???",
   "65822": "",
-  "38382": "???",
+  "38382": "Xelocube Volcanique",
   "55391": "",
   "13175": "???",
   "87729": "",
   "36942": "???",
   "39954": "",
-  "25990": "???",
+  "25990": "Aiguille Pikuxala",
   "31207": "",
-  "29964": "???",
+  "29964": "Synchronisateur Tako",
   "94750": "",
   "98371": "Esprit de l\u0027Air",
   "85445": "",
@@ -1270,42 +1263,42 @@
   "47471": "",
   "72147": "???",
   "61302": "",
-  "90093": "???",
+  "90093": "Krabken",
   "97081": "",
-  "23372": "???",
+  "23372": "Xelocube Lunaire",
   "37560": "",
   "30331": "???",
   "47856": "",
   "86748": "???",
   "63210": "",
-  "42230": "???",
+  "42230": "Sabliaton Jikan",
   "32668": "",
   "78837": "???",
   "33559": "",
-  "17233": "???",
+  "17233": "Catalysateur Pramium",
   "64183": "",
-  "50251": "???",
+  "50251": "Gro Bwork Pirate",
   "57594": "",
-  "87438": "???",
+  "87438": "Sabliaton Jikan",
   "35245": "",
   "80724": "???",
   "22071": "",
   "72836": "Boufquette",
   "84169": "Bouflépreuse",
   "26465": "",
-  "44616": "",
+  "44616": "Larbin monté Volcano\u0027culte",
   "42733": "",
-  "57474": "",
+  "57474": "Larbin Volcano\u0027culte",
   "93224": "",
-  "64605": "",
+  "64605": "Traqueur Volcano\u0027culte",
   "56497": "",
-  "17824": "",
+  "17824": "Traqueur Pirate",
   "37569": "",
-  "54754": "",
+  "54754": "Bworkokak Volcano\u0027culte",
   "60239": "",
-  "39458": "",
+  "39458": "CLAN PIRA\u0027BWORK - Bworkakorn Pirate",
   "42212": "",
-  "55798": "",
+  "55798": "Os Gelé",
   "11344": "",
   "27297": "",
   "41996": "",
@@ -1315,7 +1308,7 @@
   "60288": "",
   "17958": "Kanard",
   "57938": "",
-  "78907": "",
+  "78907": "Synchronisateur Tako",
   "89214": "",
   "34185": "",
   "50921": "",
@@ -1325,15 +1318,15 @@
   "25889": "",
   "6268": "Esprit de l\u0027Eau",
   "68619": "",
-  "56511": "",
+  "56511": "Krabapic",
   "36515": "",
-  "14100": "",
+  "14100": "Muscapol",
   "94811": "",
   "32700": "Oeil Nécromique",
   "45408": "",
-  "69258": "",
+  "69258": "Catalysateur Pramium",
   "37997": "",
-  "97387": "",
+  "97387": "Tas d\u0027Os Surin",
   "70069": "",
   "10488": "",
   "16759": "",
@@ -1347,17 +1340,22 @@
   "46226": "",
   "64079": "???",
   "54508": "",
-  "5844": "",
-  "19084": "",
-  "34482": "",
-  "17698": "",
-  "24271": "",
-  "38934": "",
-  "50583": "",
-  "59006": "",
   "18463": "",
-  "6": "",
-  "7": "",
-  "8": "",
-  "5": ""
+  "97256": "",
+  "3891": "Piège",
+  "67384": "",
+  "27462": "Piège Osseux",
+  "85328": "",
+  "51088": "Kitsu de Maître",
+  "99937": "",
+  "49785": "Piège Osseux",
+  "60139": "",
+  "90605": "Piège Osseux",
+  "22674": "",
+  "20544": "Piège Osseux",
+  "92825": "",
+  "62085": "Piège Osseux",
+  "92921": "",
+  "73915": "Piège",
+  "63413": ""
 }
\ No newline at end of file
diff --git a/data/json/dico/Companions.json b/data/json/dico/Companions.json
index effc0fc79070f0ba305b6f58a1e18aa780ac747a..f6c864bff8a8db68593874935ced3f58006f1298 100644
--- a/data/json/dico/Companions.json
+++ b/data/json/dico/Companions.json
@@ -1,23 +1,19 @@
 {
-  "372": "Companions",
+  "1036": "Companions",
   "50667": "Adamaï",
   "23442": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:834}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Téléporte la cible dans son dos.",
   "96973": "Amalia",
   "67783": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:558}.\n\\---\n-1\\_{%pa} au coût de vos sorts TERRE\u003csprite name\u003dearth\u003e.",
-  "51492": "",
-  "11442": "",
   "22062": "Oropo",
   "92592": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:575}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Piochez {value:s}\\_sort.",
   "26084": "Remington",
   "54915": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:409}.\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e ou \u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne {value:m}\\_{#POWERFULLSIGHT[MIRE PUISSANTE]}.",
-  "16309": "",
-  "21090": "",
   "59685": "Toxine",
   "39275": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:502}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Réduit de {value:pm} les {%pm} de la cible pour le tour.",
   "37181": "Tristepin",
   "34784": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:159}.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: {#STUN[ASSOMME]} vos adversaires.",
   "46073": "Ush",
-  "7326": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:410}.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Double son {%at} pour le tour si vous avez au moins {value:sp}\\_sorts dans votre main.",
+  "7326": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:410}.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: +{value:at}% aux dégâts physiques pour le tour si vous avez au moins {value:sp}\\_sorts dans votre main.",
   "43743": "Yugo",
   "17145": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:739}.\n\\---\nPasse dans le dos de son adversaire quand il subit une \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "62490": "Bump",
@@ -73,25 +69,7 @@
   "52905": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
   "22623": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Retire l\u0027état élémentaire des personnages autour\\_\u003csprite name\u003dcell_around\u003e.",
   "11338": "",
-  "29580": "{#APPEARANCE}\\_: Fait une boucle infinie qui fait crasher le serveur !",
-  "12234": "Championne de la Boucle Infinie",
-  "1324": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:x}.",
-  "65503": "Adamai",
-  "84379": "\u003cb\u003eAPPARITION\\_:\u003c/b\u003e Ajoute le sort {Spell:562} à votre main.",
-  "32889": "Gousset",
-  "49449": "Augmente vos \u003cb\u003ePA\u003c/b\u003e\u003csprite name\u003dAP\u003e de\\_1 tant qu\u0027il est en jeu.\n\u003cb\u003eMORT\\_:\u003c/b\u003e Vous gagnez 2\\_\u003cb\u003ePA\u003c/b\u003e\u003csprite name\u003dAP\u003e supplémentaires pour le prochain tour.",
-  "32570": "Ush",
-  "26556": "Peut être invoqué à 3\\_cases de votre héros.\n\u003cb\u003eAPPARITION\\_:\u003c/b\u003e Ajoute le sort {Spell:513} à votre main.",
-  "28294": "Remington",
-  "79729": "{range}\n\u003cb\u003eAPPARITION\\_:\u003c/b\u003e Ajoute le sort {Spell:181} à votre main.",
-  "84474": "\u003cb\u003eAPPARITION\\_:\u003c/b\u003e Ajoute le sort {Spell:923} à votre main.",
-  "96088": "Ruel",
-  "68845": "Nox",
-  "67438": "Augmente vos \u003cb\u003ePA\u003c/b\u003e\u003csprite name\u003dAP\u003e de\\_1 tant que NOX est en jeu.\n\u003cb\u003eAPPARITION\\_:\u003c/b\u003e Ajoute le sort {Spell:67} à votre main.",
-  "41074": "Joris",
-  "68689": "Insensible aux dégâts et soins magiques.\n\u003cb\u003eAPPARITION\\_:\u003c/b\u003e Ajoute le sort {Spell:26} à votre main.",
-  "95371": "Pacificatrice Enjouée",
-  "33006": "{range}\n\u003cb\u003eMORT\\_:\u003c/b\u003e Soigne vos personnages de {heal:h}.",
+  "1324": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {cell:x}.",
   "46452": "Bourreau Anonyme",
   "79736": "Peut être invoqué sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un héros.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Inflige son {%at} à l\u0027adversaire ayant le moins de {%pv}.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eNécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "93788": "Abigaïl",
@@ -195,49 +173,33 @@
   "84889": "Cornisha",
   "39854": "\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eNécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "11469": "Championne Embrocheuse",
-  "58614": "\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eNécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "58614": "Championne Embrocheuse",
   "12286": "Héros Martyr",
   "24043": "Peut être invoqué sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un personnage allié.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Soigne les héros alliés de la valeur de son\\_{%at}.",
   "68574": "Héros Endurci",
   "66702": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Inflige son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e.",
   "30985": "Alchimiste Armurée",
-  "14161": "Peut être invoquée jusqu\u0027à 3 cases de votre héros.\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Repousse de {cell:c} les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e.",
+  "14161": "Peut être invoquée jusqu\u0027à 3 cases de votre héros.\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: {#PUSH} de {cell:c} les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e.",
   "17821": "Championne Endoctrinée",
   "19144": "\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eNécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "55406": "Âme de Sève",
   "21119": "",
   "19923": "Héroïne Séculaire",
   "66696": "",
-  "53969": "Proctoss",
-  "49138": "\u003cb\u003eMORT\u003c/b\u003e : Pose un {FloorMechanism:1203}",
-  "19846": "Picoss",
-  "54653": "Repousse sa cible d\u0027{cell:c}\\vquand il attaque.",
-  "10164": "Arbatarba",
-  "10646": "{range}",
-  "90770": "Châtreuse",
-  "9627": "\u003cb\u003eAPPARITION\u003c/b\u003e : Dispose de {value:a}\\_{#RESURRECTIONAURA}.\n\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e : Confère 1 {#RESURRECTIONAURA} aux alliés {#AROUND} d\u0027elle.",
-  "37313": "Blockmort",
-  "92304": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e : Confère {value:ar}\\_{%ar} aux personnages alliés et {value:bl}\\_{%bl} aux mécanismes alliés \u003cb\u003eAUTOUR\u003c/b\u003e de lui.",
   "88353": "XELOR - NECROME - F",
   "18334": "\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eNécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "63379": "Otomaï",
   "78287": "",
   "90013": "Grany Smisse",
   "89668": "",
-  "61872": "Crogneur",
-  "87352": "Gagne {value:atk}\\_{%at} par \u003cb\u003eChafer\u003c/b\u003e présent en combat.",
-  "67728": "Kasimordo",
-  "58135": "\u003cb\u003eMORT\u003c/b\u003e : Se transforme en {ObjectMechanism:1964}.\nQuand il attaque : {value:atk}\\_{%at} et {value:pm}\\_{%pm} à sa cible.",
   "11930": "Cléophée",
   "56389": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:84}.\n\\---\nPeut jouer deux fois par tour.",
-  "62620": "",
-  "16947": "",
   "21283": "Flopin",
   "73936": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:339}.\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e ou \u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne {value:m}\\_{#MOTIVATINGSIGHT[MIRE MOTIVANTE]}.",
   "23457": "Khan Karkass",
   "62655": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:861}.\n\\---\nTant qu\u0027il est en jeu, vos autres alliés ont +1\\_{%pm}.",
   "5414": "Elely",
-  "18839": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:24}.\n\\---\nDouble son {%at} de base tant qu\u0027elle est le seul compagnon allié en jeu.",
+  "18839": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:24}.\n\\---\n+{value:at}% aux dégâts physiques tant qu\u0027elle est le seul compagnon allié en jeu.",
   "3137": "Jahash",
   "92674": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:313}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e : Confère autant d\u0027{%ar} que son\\_{%at} aux alliés autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "46315": "Atcham",
@@ -256,10 +218,6 @@
   "19521": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:795}.\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Retire toutes les AURAS et {#SIGHT[MIRES]} présentes sur le terrain.",
   "49523": "Maskemane",
   "9864": "",
-  "14706": "",
-  "54811": "",
-  "41162": "",
-  "56358": "",
   "12464": "Giny",
   "65380": "\u003ci\u003eAucun passif.\u003c/i\u003e",
   "81397": "Nugget",
@@ -329,7 +287,7 @@
   "45687": "Creuzar le Creuvar",
   "57140": "{#UNTARGETABLE}",
   "71714": "Colombe",
-  "85212": "Ne peut pas subir de dégât.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse d\u0027{value:cmin} à {cell:cmax}",
+  "85212": "Ne peut pas subir de dégât.\n\\---\nNe déclenche pas de dégâts de collision.",
   "41921": "Capitaine Raskass",
   "33664": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: {value:(percent/10)}% de chance d\u0027{#ANGRYDRIVE[ENRAGER]} les \u003cb\u003eBworks\u003c/b\u003e jusqu\u0027à {cell:c}.\n\\---\n{#DEATHBLOW}\\_: Se soigne d\u0027une valeur égale à son {%at}.",
   "28349": "Craqueleur Magmatique",
@@ -362,13 +320,12 @@
   "29387": "Inflige {magicalDamage:dmg} aux adversaires alignés directement avec elle jusqu\u0027à {cell:c} quand elle termine son déplacement.",
   "13420": "Scientifique",
   "77342": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Étudie la cible et fait profiter de ses découvertes à tous les alliés.",
-  "20047": "Craqueleur",
-  "31184": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique {#STUN}.\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Attaque un allié aléatoire à portée de déplacement s\u0027il est {#WHISPERED}.",
   "61065": "Armand",
   "61921": "",
   "20101": "Vampyro",
   "21401": "",
   "8935": "Xav le Boulanger",
   "66335": "",
-  "28903": "Lion Kofman"
-}
\ No newline at end of file
+  "28903": "Lion Kofman",
+  "35883": "{#MUSTNOTDIE}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e: Attire les ennemis d\u0027une 1 case."
+}
diff --git a/data/json/dico/CustomRules.json b/data/json/dico/CustomRules.json
index bac4ae4ee0a933514e2f923731d78e6318a0f4e9..7e1cf89078fc29e3f7c8ecaf048e531dae52b5ed 100644
--- a/data/json/dico/CustomRules.json
+++ b/data/json/dico/CustomRules.json
@@ -1,38 +1,81 @@
 {
-  "36": "CustomRules",
-  "49301": "Mortalité",
-  "52246": "Le {FloorMechanism:1203} est remplacé par le {FloorMechanism:576}.",
-  "76025": "Rivière des âmes",
-  "20119": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e : Inflige {value:perc}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e aux alliés sur le bord du plateau.",
+  "1036": "CustomRules",
+  "76025": "Flot d\u0027âmes",
+  "20119": "\u003cb\u003eFIN DU TOUR DES MONSTRES\u003c/b\u003e : Pose 1 {FloorMechanism:1401} sur le bord du plateau.",
   "93486": "Recyclage Damnés",
   "44526": "Soigne les Chafers de {value:perc}% de leur {%PV}\u003cb\u003eMAX\u003c/b\u003e quand un allié est éliminé.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eDans les combats de boss\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "69490": "Vers la mort",
-  "44252": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Pose un PIÈGE OSSEUX au centre du plateau.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Les PIÈGES OSSEUX attirent un allié adjacent d\u0027une case et les TOMBES MAUDITES attirent les alliés alignés à {cell:c}.",
+  "69490": "Attirance funèbre",
+  "44252": "Quand un personnage meurt\\_: Les personnages sont attirés par la {ObjectMechanism:249} alignée la plus proche.",
   "38139": "Réveil du Volcan",
-  "79926": "\u003cb\u003eDÉBUT DU TOUR 3\u003c/b\u003e : 5 SCORIES BRÛLANTES tombent sur une case aléatoire.",
+  "79926": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : {value:sco}\\_{Spell:589[SCORIES BRÛLANTES]} tombent sur des cases aléatoires.",
   "28073": "Déchaînement du Volcan",
-  "23331": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : 2 SCORIES BRÛLANTES tombent sur une case aléatoire.",
+  "23331": "\u003cb\u003eFIN DU TOUR DES BWORS\u003c/b\u003e\\_: {value:(pc/10)}% de chance que {value:sco}\\_{Spell:589} tombe sur une case aléatoire.",
   "76038": "Dispute",
   "62075": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Enrage un Bwork.",
-  "81694": "Représaille Violente",
-  "31539": "Enrage un Bwork quand l\u0027un d\u0027eux meurt.",
+  "81694": "Écoulement de lave",
+  "31539": "\u003cb\u003eFIN DU TOUR DES BWORS\u003c/b\u003e\\_: Invoque 1\\_{FloorMechanism:278} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e d\u0027une flaque de lave aléatoire.",
   "54227": "Cor de Rassemblement",
   "4016": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Invoque un Bwork sur une case adjacente au boss.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eDans les combats de boss\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "9529": "Cor de Rassemblement",
   "89593": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Invoque un Bwork sur une case adjacente au boss.",
   "46275": "Cor de Rassemblement",
   "98017": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Invoque un Bwork sur une case adjacente au boss.",
-  "1586": "Fleuve des âmes",
-  "16627": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e : Inflige {value:perc}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e aux alliés sur le bord du plateau.",
+  "1586": "Marée d\u0027âmes",
+  "16627": "\u003cb\u003eFIN DU TOUR DES MONSTRES\u003c/b\u003e : Pose 1 {FloorMechanism:1401} sur le bord du plateau.",
   "89738": "Entraînement Intensif",
-  "13409": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1\\_AURA à {value:v} Cochons.",
-  "43685": "Exercice Martial",
-  "85371": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1\\_AURA à {value:v} Cochons.",
-  "27657": "Entraînement Intensif",
-  "91026": "\u003cb\u003eCOLLISION\u003c/b\u003e : -{value:pm}\\_{%PM} pour le tour.",
-  "3783": "Entraînement Intensif",
-  "82847": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : +1\\_AURA au CHEVALIER DE PARME s’il n’en possède pas",
+  "13409": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1\\_\u003cb\u003eAURA\u003c/b\u003e à {value:v}\\_\u003cb\u003eCochons\u003c/b\u003e aléatoires.",
+  "43685": "Entrainement Intensif",
+  "85371": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1\\_\u003cb\u003eAURA\u003c/b\u003e à {value:v}\\_\u003cb\u003eCochon\u003c/b\u003e aléatoire.",
   "30448": "Armée Cochonne",
-  "71324": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Invoque un PORIGAMI sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un Cochon.",
-  "30533": "Sagesse des Ainés"
+  "71324": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Invoque un {Summoning:483} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un \u003cb\u003eCochon\u003c/b\u003e.",
+  "30533": "Sagesse des Ainés",
+  "49494": "\u003cb\u003eDÉBUT DU TOUR DES COCHONS\u003c/b\u003e : Confère un {#SHIELD} et +{value:aura}\\_AURA au PORIGAMI.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eDans les combats de boss\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "32967": "Marée d\u0027âmes",
+  "32522": "\u003cb\u003eFIN DU TOUR DES MONSTRES\u003c/b\u003e : Pose 1 à 2 {FloorMechanism:1401[FLAQUES D\u0027EAU DAMNÉES]} sur le bord du plateau.",
+  "75811": "\u003cb\u003eFIN DU TOUR DES MONSTRES\u003c/b\u003e : Pose 1 à 2 {FloorMechanism:1285[FLAQUES D\u0027EAU DAMNÉES SUPERIEURES]} sur le bord du plateau.",
+  "66619": "Déluge d\u0027Âmes",
+  "14498": "Entraînement Intensif",
+  "88588": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1\\_\u003cb\u003eAURA\u003c/b\u003e à {value:v}\\_\u003cb\u003eCochons\u003c/b\u003e aléatoires.",
+  "62288": "EXERCICE MARTIAL",
+  "30959": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1\\_\u003cb\u003eAURA\u003c/b\u003e à {value:v}\\_\u003cb\u003eCochons\u003c/b\u003e aléatoires.",
+  "81355": "Réveil du Volcan",
+  "6": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : {value:sco}\\_{Spell:589[SCORIES BRÛLANTES]} tombent sur des cases aléatoires.",
+  "41751": "Réveil du Volcan",
+  "31678": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : {value:sco}\\_{Spell:589[SCORIES BRÛLANTES]} tombent sur des cases aléatoires.",
+  "86312": "Réveil du Volcan",
+  "15463": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : {value:sco}\\_{Spell:589[SCORIES BRÛLANTES]} tombent sur des cases aléatoires.",
+  "52888": "Maitrise du Combat",
+  "40019": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Construit un {ObjectMechanism:964}.",
+  "28632": "Maitrise du Combat",
+  "84423": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Construit \u003cb\u003e2\u003c/b\u003e {ObjectMechanism:634}.",
+  "2493": "Kata Parfait",
+  "46863": "Quand un \u003cb\u003eCochon\u003c/b\u003e libère une \u003cb\u003eAURA\u003c/b\u003e\\_:\\v Les alliés autour\\_\u003csprite name\u003dcell_around\u003e gagnent +{value:pp}% aux dégâts physiques pour le tour.",
+  "37812": "Écoulement de lave",
+  "46838": "\u003cb\u003eFIN DU TOUR DES BWORS\u003c/b\u003e\\_: Invoque {value:fla}\\_{FloorMechanism:278[FLAQUES DE LAVE]} sur les cases adjacentes\\_\u003csprite name\u003dcell_cross\u003e d\u0027une flaque de lave aléatoire.",
+  "22649": "Déluge d\u0027âmes",
+  "76914": "\u003cb\u003eFIN DU TOUR DES MONSTRES\u003c/b\u003e : Pose 1 {FloorMechanism:1285} sur le bord du plateau.",
+  "84918": "NÉCROPOLE MAUDITE",
+  "31392": "\u003cb\u003eDÉBUT DU COMBAT \u003c/b\u003e : Construit 2 {ObjectMechanism:249} sur le plateau.",
+  "87710": "Nécropole Maudite",
+  "278956": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Pose 1 {ObjectMechanism:249} sur le plateau.",
+  "41945": "Nécropole Maudite",
+  "26182": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Pose 2 {ObjectMechanism:249[TOMBES MAUDITES]} sur le plateau.",
+  "93528": "Nécropole Maudite",
+  "58654": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Pose 2 {ObjectMechanism:249[TOMBES MAUDITES]} sur le plateau.",
+  "3805": "Nécropole Maudite",
+  "65000": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Pose 2 {ObjectMechanism:249} sur le plateau.",
+  "89510": "Attirance funèbre",
+  "35341": "Quand un personnage meurt\\_: Les personnages sont attirés par la {ObjectMechanism:249} alignée la plus proche.",
+  "86360": "Déchaînement du Volcan",
+  "21322": "\u003cb\u003eFIN DU TOUR DES BWORS\u003c/b\u003e\\_: {value:(pc/10)}% de chance que {value:sco}\\_{Spell:589} tombe sur une case aléatoire suivie par {Spell:497}.",
+  "30600": "Écoulement de lave",
+  "64699": "\u003cb\u003eFIN DU TOUR DES BWORS\u003c/b\u003e\\_: Invoque 1\\_{FloorMechanism:278} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e d\u0027une flaque de lave aléatoire.",
+  "56981": "DOJO PIÉGÉ",
+  "95319": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : Pose 2 {FloorMechanism:1370[KATA-TRAPPES DU DOJO]}.",
+  "60125": "DOJO PIÉGÉ",
+  "39367": "DÉBUT DU COMBAT : Pose 3 {FloorMechanism:1370[KATA-TRAPPES DU DOJO]}.",
+  "63872": "DOJO PIÉGÉ",
+  "44903": "DÉBUT DU COMBAT : Pose 4 {FloorMechanism:1370[KATA-TRAPPES DU DOJO]}.",
+  "16401": "Entrainement Intensif",
+  "95190": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +1 \u003cb\u003eAURA\u003c/b\u003e à 1 Cochon aléatoire."
 }
\ No newline at end of file
diff --git a/data/json/dico/Effects.json b/data/json/dico/Effects.json
index 532df05de745ba9b7d62108cba61e83f067ad05c..3dab8239566a7f9a7ec7c0fbbe0b0295e9b42064 100644
--- a/data/json/dico/Effects.json
+++ b/data/json/dico/Effects.json
@@ -1,7 +1,6 @@
 {
-  "0": "",
-  "407": "Effects",
-  "89927": "{ 0, plural, one[#\\_dégât] other[#\\_dégâts] }",
+  "1036": "Effects",
+  "89927": "{ 0, plural, one[#\\_dégât magique] other[#\\_dégâts magiques] }",
   "4272": "{0}\\_\u003cb\u003ePV\u003c/b\u003e\u003csprite name\u003dPV/\u003e",
   "91717": "{0}\\_\u003cb\u003eBL\u003c/b\u003e\u003csprite name\u003dBL/\u003e",
   "59689": "+{0} à votre jauge EAU\u003csprite name\u003dwater\u003e",
@@ -183,7 +182,6 @@
   "21388": "Aura de Résurrection",
   "62211": "Libérée à la fin du tour.",
   "2103": "GOUTTE",
-  "97167": "COLÉRIQUE",
   "95616": "PULSION COLÉRIQUE",
   "78594": "Libérées quand le personnage attaque, inflige 4 dégâts par pulsion libérée",
   "59239": "RAGE",
@@ -227,7 +225,7 @@
   "37382": "BELATORUS",
   "24372": "Votre héros gagne {value:FloatingCounterEffect.52.at}% d\u0027{%at} et {value:FloatingCounterEffect.52.pm}\\_{%pm}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Votre héros perd 1\\_AURA.",
   "87179": "RIPOSTE",
-  "88402": "Inflige des dégâts quand le personnage subit une attaque jusqu\u0027à prochain tour.",
+  "88402": "Inflige des dégâts quand le personnage subit une attaque.",
   "83165": "ECORCHORUS PELIS",
   "25856": "+{attackBoost:Spell.7451.at}, puis +1\\_{%pm} par {%pa} dans votre {%reserve}.",
   "41075": "MOMIFICATUS",
@@ -255,7 +253,7 @@
   "53305": "Posture Défensive",
   "68570": "Tant que la Posture est active, l\u0027entité déclenche une attaque sur l\u0027assaillant quand elle subit une attaque.\nUne unique posture par entité.",
   "13102": "Posture Offensive",
-  "87656": "Tant que la Posture est active, l\u0027entité gagne +{attackBoost:PropertyEffect.51.OffStanceAT} et +1\\_{%pm}.\nUne unique posture par entité.",
+  "87656": "Tant que la Posture est active, l\u0027entité gagne +{value:PropertyEffect.51.OffStanceAT}% de dégâts physiques et +1\\_{%pm}.\nUne unique posture par entité.",
   "18442": "CROISSOEUF",
   "54690": "Apparait avec 3 \u003cb\u003eCOQUILLES\u003c/b\u003e. Il en perd une au début de chaque tour et évolue quand il n\u0027en a plus.",
   "84962": "Quand un autre allié subit une attaque, inflige son {%at} à l\u0027attaquant s\u0027il est à portée.",
@@ -278,7 +276,7 @@
   "25772": "Permet d\u0027appliquer des effets supplémentaires.",
   "5829": "\u003cb\u003eCC\u003c/b\u003e\u003csprite name\u003dcriticalhit/\u003e",
   "58479": "Trait de Glace",
-  "60573": "Lorsqu\u0027un allié subit une attaque : Applique {frozen:PropertyEffect.72.FrozenDmg} et vol 1 {%pa} à la {%reserve} ⣬de l\u0027attaquant s\u0027il est à portée.",
+  "60573": "Quand un autre allié subit une attaque, applique {frozen:PropertyEffect.26.FrozenDmg} à l\u0027attaquant s\u0027il est à portée.",
   "3506": "Libérée quand le personnage attaque.\n{#AURA}\\_: Inflige {magicalDamage:FloatingCounterEffect.98.FatalDmg} à la cible et pioche un sort.",
   "68338": "ÉPÉE FUNESTE",
   "49313": "ATTAQUE ÉCLAIR",
@@ -293,7 +291,6 @@
   "27677": "Permet d\u0027appliquer des effets supplémentaires.",
   "25982": "VOLCAN",
   "82032": "Une attaque du volcan qui inflige des dégâts si un personnage est touché ou pose une {FloorMechanism:278} si une case libre est touchée.",
-  "58895": "Le double est une duplication de l\u0027entité qui l\u0027a créé. Il peut se déplacer, attaquer et bénéficier des mêmes choses qu\u0027une entité normale mais est détruit s\u0027il subit le moindre dégât.",
   "31209": "Parasité\\_\u003csprite name\u003dgeneric_monster\u003e",
   "78049": "Permet d\u0027appliquer des effets supplémentaires.",
   "2783": "COUP CRITIQUE",
@@ -371,7 +368,7 @@
   "97855": "CHAMPION DU JOUR",
   "39438": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.360.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\n{#DEATHBLOW!}\\_: Ajoute le sort {Spell:65351!} à votre main.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_AURA CHAMPION",
   "61162": "CHAMPION DE LA LUNE",
-  "90854": "25% de chance de déclencher à nouveau son effet.",
+  "90854": "50% de chance de déclencher son effet une seconde fois.",
   "45136": "ÉCLAIR",
   "53723": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.128.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e et  \u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Ajoute le sort {Spell:38} à votre main si vous n\u0027en avez pas.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_AURA CHAMPION",
   "57003": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.782.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\nQuand il gagne de l\u0027{%AR} votre héros déclenche une {#explosion} d\u0027une valeur égale à {value:Skill.782.perc2}% de son {%AT}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_AURA CHAMPION",
@@ -394,17 +391,31 @@
   "45176": "Inflige x% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.",
   "15985": "DÉLUGE",
   "42121": "MIRE FOUDROYANTE",
-  "71277": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.99.mireDmg} au prochain adversaire ciblé par un de vos sorts. Elle a {value:FloatingCounterEffect.99.rain}% de chance de déclencher ⣮à nouveau son effet.",
-  "19127": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.100.mireDmg} au prochain adversaire ciblé par un de vos sorts et soigne votre héros d\u0027autant.",
+  "71277": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.99.mireDmg} au prochain adversaire ciblé par un de vos sorts. Confère 1 {%PM} à votre héros pour le tour quand elle est libérée.",
+  "19127": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.100.mireDmg} au prochain adversaire ciblé par un de vos sorts et applique {frozen:PropertyEffect.26.FrozenDmg}.",
   "99610": "MIRE SPECTRALE",
   "55554": "MIRE DÉTONANTE",
-  "71613": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.101.mireDmg} au prochain adversaire ciblé par un de vos sorts et aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e.",
+  "71613": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.101.mireDmg} au prochain adversaire ciblé par un de vos sorts et la cible déclenche {explosion:FloatingCounterEffect.101.ex}.",
   "96329": "MIRE COSMIQUE",
-  "2812": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.102.mireDmg} au prochain adversaire ciblé par un de vos sorts ainsi qu\u0027aux adversaires alignés avec lui.",
+  "2812": "Projectile qui inflige {magicalDamage:FloatingCounterEffect.102.mireDmg} au prochain adversaire ciblé par un de vos sorts. Réduit de 1\\_{%PA} le coût du prochain sort joué quand elle est libérée.",
   "33762": "{0}",
   "22700": "Utilisation impossible",
   "5607": "Cet objet est déjà équipé.",
-  "44565": "Votre héros est transformé tant qu\u0027il possède au moins une AURA CHAMPION.",
-  "10629": "AURAS CHAMPIONS",
-  "49462": "Votre héros reste transformé tant qu\u0027il possède au moins une AURA CHAMPION."
+  "49462": "Votre héros reste transformé tant qu\u0027il possède au moins une AURA CHAMPION.",
+  "59607": "AURA CHAMPION",
+  "27272": "{ 0, plural, one[#\\_dégât physique] other[#\\_dégâts physiques] }",
+  "53528": "CARTOUCHE ENCRÉE",
+  "69754": "Quand un autre allié subit une attaque ou est la cible d\u0027un sort, inflige {magicalDamage:FloatingCounterEffect.103.mireDmg} dégâts à l\u0027attaquant.",
+  "92939": "REPOUSSE",
+  "37559": "Si le mouvement de repousse est bloqué par un bostacle, l\u0027obstacle et la cible subissent 10 dégâts physiques.",
+  "60847": "POING MUSCLÉ",
+  "80875": "Lorsque votre héros est attaqué, inflige son {%AT} à l\u0027attaquant.",
+  "20418": "EXALTÉ",
+  "69918": "Déclenche l\u0027effet au début du tour. Exalté disparait pour le tour si le personnage subit des dégâts de sorts.",
+  "18681": "Trait Nécrotique",
+  "12618": "Quand un autre allié subit une attaque, applique \u003cb\u003eNÉCROSÉ\u003c/b\u003e\\_\u003csprite name\u003dgeneric_monster\u003e\\_à l\u0027attaquant s\u0027il est à portée.",
+  "24603": "WAKFU",
+  "45627": "Votre niveau de Wakfu vous permet de lancer des sorts bien plus puissant que la moyenne.",
+  "90157": "STASIS",
+  "95231": "Votre niveau de Stasis vous permet de lancer des sorts bien plus puissant que la moyenne."
 }
diff --git a/data/json/dico/Equipments.json b/data/json/dico/Equipments.json
index 7410388fad221165f1a99908ed85e20284bfe8d0..37d5c70483b2cf12f615fd5e9d3a0fe43623ac8c 100644
--- a/data/json/dico/Equipments.json
+++ b/data/json/dico/Equipments.json
@@ -1,5 +1,5 @@
 {
-  "870": "",
+  "1036": "Equipments",
   "22037": "Manubrium de la Mort qui Tue",
   "93902": "\u003cb\u003eDEBUT DE TOUR\u003c/b\u003e : Tue tous les ennemis.",
   "714": "Rubis Magique",
@@ -382,40 +382,22 @@
   "44930": "Commun",
   "54285": "Rare",
   "9790": "Légendaire",
-  "13792": "Ogomatta Chasseur",
-  "21618": "Ajoute le sort suivant à votre deck :",
   "76456": "Anneau Fragé",
   "2163": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Confère +2\\_{%pm} à votre héros pour un tour.\n\\---\n+{value:pdv}% aux {%pv} max.",
-  "35088": "Anneau Strogote",
-  "72167": "+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:(ccP/10)}% de CC d\u0027Arme.",
   "39922": "Anneau d\u0027Evanescence",
   "46592": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(dodge/10)}% d\u0027esquive.",
   "64286": "Anneau Pignatre",
   "70567": "+{value:dmgP}% aux dégâts d\u0027Arme.\n\\---\n+{value:(ccP/10)}% de CC d\u0027Arme.",
-  "14385": "Anneau Taku",
-  "32714": "+{value:dmgM}% aux dégâts des Sorts.\n+{value:(ccM/10)}% de CC des Sorts.",
-  "53186": "Anneau Rifique",
-  "23676": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: Réduit de 1\\_{%pa} le coût de vos sorts pour le tour si vous avez au moins 5\\_{%pa} dans votre {%reserve}.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
   "57302": "Anneau Lémain",
   "71519": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:(resM/10)}% de résistance magique.",
-  "69559": "Anneau Greuh",
-  "38633": "+{value:pdv}% aux {%pv} max.\n+{value:(resP/10)}% de résist. Physique.",
   "71766": "Anneau Mage",
   "2646": "+{value:dmgM}% aux dégâts des Sorts.\n\\---\n+{value:(ccM/10)}% de CC des Sorts.",
-  "26549": "Anneau Rifice",
-  "59826": "Confère +{attackBoost:at} à votre héros pour le tour quand vous jouez un sort coûtant au moins 5\\_{%pa}.\n\\---\n+{value:dmgP}% aux dégâts d\u0027Arme.",
-  "62204": "Anneau Devie",
-  "76525": "Soigne votre héros de {heal:pv} quand un compagnon allié coûtant au moins 5\\_jauges est invoqué.\n\\---\n+{value:h}% aux Soins.",
-  "40813": "Anneau Pake",
-  "44831": "+{value:dmgM}% aux dégâts des Sorts.\n+{value:ar}% aux gains d’{%ar}.",
   "76366": "Anneau Gnon",
-  "7646": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Votre héros gagne +{armor:ar}.\n\\---\n+{value:dmgP}% aux dégâts d\u0027Arme.",
+  "7646": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Votre héros gagne +{armor:ar} par niveau de votre héros.",
   "92811": "Anneau de Richesse",
   "76104": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:kam}% de kamas obtenus sur les monstres.",
   "33075": "Anneau Yé",
   "39494": "+{value:kam}% aux Drops de Kamas.\n\\---\n+{value:drop}% aux Drops d\u0027objets.",
-  "83925": "Anneau Pinel",
-  "80580": "+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:(ccP/10)}% de CC d\u0027Arme.\n+{value:dccP}% aux dégâts CC d\u0027Arme.",
   "77673": "Anneau de l\u0027Oracle",
   "11412": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:pdv}% aux {%pv} max.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.",
   "35092": "Anneau du Guerrier",
@@ -430,40 +412,38 @@
   "57898": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(resM/10)}% de résistance magique.\n\\---\n+{value:(dodge/10)}% d\u0027esquive.",
   "98803": "Anneau du Bretteur",
   "27749": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:at}% aux gains et réductions d\u0027{%at}.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.",
-  "82428": "Anneau de l\u0027Occultiste",
-  "87295": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:(ccM/10)}% de chance d\u0027effectuer des critiques magiques.",
+  "82428": "Anneau Cyprès",
+  "87295": "{#DEATHBLOW}\\_:  Applique l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e aux adversaires autour \u003csprite name\u003dcell_around\u003e de la cible.\n\\---\n+{value:pdmg}% aux dégâts physiques.\n(+ 0.5% par niveau)",
   "12519": "Anneau du Bourreau",
   "58451": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:pdv}% aux {%pv} max.\n\\---\n+{value:(ccP/10)}% de chance d\u0027effectuer des critiques physiques.",
   "37529": "Anneau du Magnétiseur",
   "43173": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:at}% aux gains et réductions d\u0027{%at}.",
   "25611": "Anneau du Mage",
   "38585": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(ccM/10)}% de chance d\u0027effectuer des critiques magiques.\n\\---\n+{value:dccP}% aux dégâts critiques magiques.",
-  "76418": "Anneau de l\u0027Ensorceleur",
-  "76677": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(ccM/10)}% de chance d\u0027effectuer des critiques magiques.\n\\---\n+{value:(resM/10)}% de résistance magique.",
+  "76418": "Anneau Nobstant",
+  "76677": "Confère +{armor:ar} à votre héros quand vous appliquez {#STUN[ASSOMMÉ]}.\n\\---\n+{value:A}% aux gains d\u0027{%AR}.\n(+ 0.5% par niveau)",
   "23926": "Anneau du Répurgateur",
   "76703": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(resM/10)}% de résistance magique.",
   "4095": "Anneau du Prêtre",
   "81022": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:h}% aux soins.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.",
   "83602": "Anneau du Métamorphe",
   "71220": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(ccP/10)}% de chance d\u0027effectuer des critiques physiques.",
-  "34218": "Anneau du Ménestrel",
-  "25172": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:pdv}% aux {%pv} max.\n\\---\n+{value:h}% aux soins.",
+  "34218": "Anneau Dylderay",
+  "25172": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: ajoute {addAir:value}.",
   "62470": "Anneau du Roublard",
   "10023": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:(dodge/10)}% d\u0027esquive.",
   "96370": "Anneau du Mercenaire",
   "46831": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:(resP/10)}% de résistance physique.",
-  "78021": "Anneau du Sorcier",
-  "79592": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(resM/10)}% de résistance magique.\n\\---\n+{value:(resP/10)}% de résistance physique.",
+  "78021": "Anneau Pital",
+  "79592": "+{value:hp}% aux {%pv}max.\n(+ 0.3% par niveau)\\v\\---\n+{value:heal}% aux soins.\n(+ 0.2% par niveau)",
   "68262": "Anneau du Chamane",
   "90646": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:(ccM/10)}% de chance d\u0027effectuer des critiques magiques.\n\\---\n+{value:dccP}% aux dégâts critiques magiques.",
   "34192": "Anneau de l\u0027Assassin",
   "87744": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(dodge/10)}% d\u0027esquive.",
   "27286": "Anneau du Mage de Combat",
   "33481": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.",
-  "84533": "Anneau du Bagarreur",
-  "82835": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:(resM/10)}% de résistance magique.\n\\---\n+{value:(resP/10)}% de résistance physique.",
-  "23059": "Anneau du Mentaliste",
-  "31803": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:at}% aux gains et réductions d\u0027{%at}.",
+  "23059": "Anneau Parleur",
+  "31803": "+{value:ar}% aux gains d\u0027{%ar}.\n(+ 0.3% par niveau)\n\\---\n+{value:hp}% au {%pv}max.\n(+ 0.2% par niveau)",
   "15715": "Anneau du Clerc",
   "70175": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:h}% aux soins.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.",
   "89175": "Anneau du Prêtre de Guerre",
@@ -474,126 +454,22 @@
   "54911": "+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:pdv}% aux {%pv} max.\n\\---\n+{value:h}% aux soins.",
   "57361": "Anneau du Cultiste",
   "86635": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:dmgM}% aux dégâts magiques.\n\\---\n+{value:(dodge/10)}% d\u0027esquive.",
-  "8809": "Anneau du Chevalier",
-  "24803": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:pdv}% aux {%pv} max.\n\\---\n+{value:at}% aux gains et réductions d\u0027{%at}.",
+  "8809": "Anneau Sferatu",
+  "24803": "Piochez un sort quand vous utilisez votre réserve si celle-ci contient {value:nbPA}\\_{%PA} ou plus.\n\\---\n+{value:mdmg}% aux dégâts magiques.\n(+ 0.5% par niveau)",
   "92834": "Anneau de l\u0027Élémentaliste",
   "19588": "+{value:dmgM}% aux dégâts des Sorts.\n\\---\n+{value:pdv}% aux {%pv} max.\n\\---\n+{value:(ccM/10)}% de CC des Sorts.",
-  "51829": "Gemme de Flux",
-  "79758": "Ajoute le sort {Spell:334} à votre deck.",
-  "12376": "Gemme de Forage",
-  "28516": "Ajoute le sort {Spell:61201} à votre deck.",
-  "17270": "Gemme de Siroco",
-  "11626": "Ajoute le sort {Spell:61045} à votre deck.",
-  "6603": "Gemme d\u0027Ardeur",
-  "93555": "Ajoute le sort {Spell:790} à votre deck.",
-  "3433": "Gemme de Détonation",
-  "20093": "Ajoute le sort {Spell:124} à votre deck.",
-  "77350": "Gemme de Magnat",
-  "21605": "Ajoute le sort {Spell:763} à votre deck.",
-  "38756": "Quartaclysme",
-  "18195": "Ajoute le sort suivant à votre deck :",
-  "89192": "Ogomatta Violent",
-  "85949": "Ajoute le sort suivant à votre deck :",
-  "87557": "Helianthe Lascive",
-  "46024": "Ajoute le sort suivant à votre deck :",
-  "47104": "Ogomatta Curatif",
-  "4829": "Ajoute le sort suivant à votre deck :",
-  "22860": "Gemme d\u0027Assaut Groupé",
-  "20972": "Ajoute le sort {Spell:60406} à votre deck.",
-  "20831": "Crachin",
-  "55751": "Ajoute le sort suivant à votre deck :",
-  "75642": "Gemme d\u0027Entassement",
-  "68813": "Ajoute le sort {Spell:962} à votre deck.",
-  "40885": "Gemme de Jouvence",
-  "8846": "Ajoute le sort {Spell:60232} à votre deck.",
-  "64497": "Gemme d\u0027Appui",
-  "10784": "Ajoute le sort {Spell:398} à votre deck.",
-  "58696": "Gemme d\u0027Armature",
-  "33711": "Ajoute le sort {Spell:60508} à votre deck.",
-  "70267": "Bubon d\u0027Argile",
-  "35853": "Ajoute le sort suivant à votre deck :",
-  "55349": "Ogomatta Protecteur",
-  "70984": "Ajoute le sort suivant à votre deck :",
-  "40464": "Gemme de Reconstruction",
-  "53921": "Ajoute le sort {Spell:61029} à votre deck.",
-  "7301": "Gemme d\u0027Aurore",
-  "12311": "Ajoute le sort {Spell:177} à votre deck.",
-  "82173": "Gemme de Bagatelle",
-  "47475": "Ajoute le sort {Spell:333} à votre deck.",
-  "25127": "Gemme d\u0027Intempérie",
-  "23801": "Ajoute le sort {Spell:61647} à votre deck.",
-  "55208": "Gemme de Luminescence",
-  "30648": "Ajoute le sort {Spell:68} à votre deck.",
-  "24164": "Gemme de Rancune",
-  "82377": "Ajoute le sort {Spell:744} à votre deck.",
-  "15171": "Gemme d\u0027Atout",
-  "73851": "Ajoute le sort {Spell:253} à votre deck.",
-  "7245": "Gemme de Requiem",
-  "62428": "Ajoute le sort {Spell:672} à votre deck.",
-  "13606": "Gemme d\u0027Éclatement",
-  "90786": "Ajoute le sort {Spell:668} à votre deck.",
-  "37390": "Gemme de Traque",
-  "30063": "Ajoute le sort {Spell:637} à votre deck.",
-  "75997": "Gemme de Charge Butoir",
-  "33280": "Ajoute le sort {Spell:62935} à votre deck.",
-  "44402": "Gemme de Rédemption",
-  "90575": "Ajoute le sort {Spell:653} à votre deck.",
-  "74699": "Gemme de Catapultage",
-  "44839": "Ajoute le sort {Spell:420} à votre deck.",
-  "16760": "Gemme de Perfection",
-  "39681": "Ajoute le sort {Spell:720} à votre deck.",
-  "10567": "Gemme d\u0027Entraînement",
-  "96323": "Ajoute le sort {Spell:62257} à votre deck.",
-  "53839": "Gemme de Glorification",
-  "80278": "Ajoute le sort {Spell:63100} à votre deck.",
-  "28131": "Gemme du Cri de Guerre",
-  "78073": "Ajoute le sort {Spell:786} à votre deck.",
-  "19033": "Gemme de Courroux",
-  "75870": "Ajoute le sort {Spell:63717} à votre deck.",
-  "56776": "Gemme de Lecture du Vent",
-  "88025": "Ajoute le sort {Spell:707} à votre deck.",
-  "89282": "Gemme de Tornade Sauvage",
-  "40548": "Ajoute le sort {Spell:63479} à votre deck.",
-  "16307": "Gemme de Fumigène",
-  "29096": "Ajoute le sort {Spell:64308} à votre deck.",
-  "64836": "Gemme de Glaçon",
-  "25686": "Ajoute le sort {Spell:851} à votre deck.",
-  "82576": "Gemme de la Goutte du Kraken",
-  "18479": "Ajoute le sort {Spell:937} à votre deck.",
-  "71060": "Gemme d\u0027Embrasement",
-  "54469": "Ajoute le sort {Spell:510} à votre deck.",
-  "45549": "Gemme de Retour de Flamme",
-  "85420": "Ajoute le sort {Spell:64522} à votre deck.",
-  "7861": "Gemme de Traînée de Poudre",
-  "7175": "Ajoute le sort {Spell:64779} à votre deck.",
-  "39328": "Gemme de Météore",
-  "40168": "Ajoute le sort {Spell:305} à votre deck.",
-  "24877": "Gemme de Ruée",
-  "32059": "Ajoute le sort {Spell:847} à votre deck.",
-  "47978": "Gemme de Ciment",
-  "32444": "Ajoute le sort {Spell:721} à votre deck.",
-  "79129": "Gemme de Fossilisation",
-  "95327": "Ajoute le sort {Spell:690} à votre deck.",
-  "44460": "Gemme de Moisson",
-  "7397": "Ajoute le sort {Spell:64908} à votre deck.",
-  "57346": "Anneau de Test",
-  "32521": "[TEST]\n+{value:dv1}% d\u0027{%at}\n+{value:dv2}% aux modificateurs d\u0019{%at}",
+  "57346": "Anneau Pération",
+  "32521": "+{value:exb}% aux dégâts d\u0027{#EXPLOSION}.\n(+ 0.3% par niveau)\\v\\---\n+{attackBoost:mpow}",
   "42488": "Gemme de Test",
   "28243": "[TEST]\n+{value:mr}% aux gains d\u0019{%mr}\n+{value:cd}% aux modificateurs d\u0019{%cd}",
   "43479": "Anneau Daim",
   "44400": "Quand votre héros tombe en dessous de \u003cif deck\u003e30% de ses {%pv}\u003c/if\u003e\u003cif fight\u003e{value:pv}\\_{%pv}\u003c/if\u003e, il gagne +{attackBoost:at}.\n\\---\n+{value:pdv}% aux {%pv} max.",
   "46215": "Anneau de Tempête",
   "6884": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:dccM}% aux dégâts critiques magiques.",
-  "28269": "Anneau Kupant",
-  "80911": "+{value:pdv}% aux {%pv} max.\n+{value:(dodge/10)}% à l\u0027Esquive.",
-  "62963": "Vulk Anneau",
-  "22264": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: {addFire:j}.\n\\---\n+{value:at}% aux gains d\u0027{%at}.",
   "56945": "Anneau de Renforcement",
   "32633": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.",
   "1515": "Anneau Tation",
   "70900": "\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e\\_: -1\\_{%pa} au coût de votre prochain sort pour le tour.\n\\---\n+{value:dmgP}% aux dégâts physiques.",
-  "9098": "Anneau Vulant",
-  "12734": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Ajoute {addReserve:r}.\n\\---\n+{value:pdv}% aux {%pv} max.",
   "48763": "Anneau Voïde",
   "10969": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:ar}% aux gains d\u0019{%ar}.",
   "89481": "Anneau Bligatoire",
@@ -606,257 +482,43 @@
   "7689": "+{value:dmgP}% aux dégâts physiques.\n\\---\n+{value:(resP/10)}% de résistance physique.\n\\---\n+{value:(dodge/10)}% d\u0027esquive.",
   "75555": "Anneau du Troubadour",
   "96278": "+{value:pdv}% aux {%pv} max.\n\\---\n+{value:h}% aux soins.\n\\---\n+{value:at}% aux gains et réductions d\u0027{%at}.",
-  "64207": "Toufeutouflamme",
-  "1207": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Place le sort suivant dans votre main.",
-  "43039": "Ocoralina Magmatique",
-  "76755": "Ajoute le sort suivant à votre deck :",
-  "81508": "Feu Mollet",
-  "47941": "Ajoute le sort suivant à votre deck :",
-  "58008": "Perle Mikui",
-  "9325": "Ajoute le sort suivant à votre deck :",
-  "22837": "Jaspe Calcifié",
-  "35143": "Ajoute le sort suivant à votre deck :",
-  "83212": "Sacrée Flamme",
-  "20845": "Ajoute le sort suivant à votre deck :",
-  "64042": "Scorie Ardente",
-  "91212": "Ajoute le sort suivant à votre deck :",
-  "41927": "Karakéole",
-  "66372": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Place le sort suivant dans votre main.",
-  "68913": "Bloc Agité",
-  "32018": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Place le sort suivant dans votre main.",
-  "91385": "Goutte Animée",
-  "30915": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Place le sort suivant dans votre main.",
-  "79261": "Eclat Akilon",
-  "6274": "Ajoute le sort suivant à votre deck :",
-  "33843": "Volovent",
-  "70963": "Ajoute le sort suivant à votre deck :",
-  "68271": "Foudroyeur",
-  "87248": "Ajoute le sort suivant à votre deck :",
-  "24924": "Vortex Déchainé",
-  "5913": "Ajoute le sort suivant à votre deck :",
-  "84186": "Grondorage",
-  "10458": "Ajoute le sort suivant à votre deck :",
-  "79211": "Orbe Mugissant",
-  "8746": "Ajoute le sort suivant à votre deck :",
-  "597": "Protecteur Terreux",
-  "96647": "Ajoute le sort suivant à votre deck :",
-  "90734": "Terragano",
-  "24280": "Ajoute le sort suivant à votre deck :",
-  "54247": "Graine Terrassante",
-  "484": "Ajoute le sort suivant à votre deck :",
-  "69624": "Brise Crâne",
-  "98031": "Ajoute le sort suivant à votre deck :",
-  "35127": "Roc Ibalboa",
-  "21265": "Ajoute le sort suivant à votre deck :",
-  "22069": "Creuztombe",
-  "47604": "Ajoute le sort suivant à votre deck :",
-  "89421": "Roche Chagrine",
-  "86033": "Ajoute le sort suivant à votre deck :",
-  "8756": "Onde Deressac",
-  "34362": "Ajoute le sort suivant à votre deck :",
-  "87989": "Gelâme",
-  "45083": "Ajoute le sort suivant à votre deck :",
-  "44707": "Bulle Calmante",
-  "60234": "Ajoute le sort suivant à votre deck :",
-  "5939": "Coeur de la Mer",
-  "84101": "Ajoute le sort suivant à votre deck :",
-  "139136": "Perle Enmeyer",
-  "50686": "Ajoute le sort suivant à votre deck :",
-  "89747": "Gon Draconique",
-  "61696": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Place le sort suivant dans votre main.",
-  "80409": "Graine Draconique",
-  "70599": "Ajoute le sort suivant à votre deck :",
-  "34580": "Essence Draconique",
-  "5007": "Ajoute le sort suivant à votre deck :",
-  "23226": "Brise Draconique",
-  "33204": "Ajoute le sort suivant à votre deck :",
-  "28080": "Uricane Draconique",
-  "79092": "Ajoute le sort suivant à votre deck :",
-  "70412": "Drouragan Draconique",
-  "99188": "Ajoute le sort suivant à votre deck :",
-  "16275": "Agathe Draconique",
-  "25250": "Ajoute le sort suivant à votre deck :",
-  "40660": "Zenkero Draconique",
-  "59332": "Ajoute le sort suivant à votre deck :",
-  "58468": "Incandescente Draconique",
-  "58336": "Ajoute le sort suivant à votre deck :",
-  "68146": "Ayamali Draconique",
-  "81102": "Ajoute le sort suivant à votre deck :",
-  "73921": "Roc Draconique",
-  "82557": "Ajoute le sort suivant à votre deck :",
-  "78560": "Gravillon Draconique",
-  "66854": "Ajoute le sort suivant à votre deck :",
-  "12129": "Lacrypabien Draconique",
-  "48021": "Ajoute le sort suivant à votre deck :",
-  "28307": "Vagalame Draconique",
-  "46428": "Ajoute le sort suivant à votre deck :",
-  "4415": "Ktunami Draconique",
-  "67069": "Ajoute le sort suivant à votre deck :",
-  "90465": "Sibylle Nécromique",
-  "88289": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Place le sort suivant dans votre main.",
-  "83309": "Reviviscence Nécromique",
-  "82633": "Ajoute le sort suivant à votre deck :",
-  "76667": "Mandatrice Nécromique",
-  "21291": "Ajoute le sort suivant à votre deck :",
-  "66073": "Effluve Nécromique",
-  "27857": "Ajoute le sort suivant à votre deck :",
-  "72491": "Essouffleur Nécromique",
-  "25943": "Ajoute le sort suivant à votre deck :",
-  "3759": "Expirante Nécromique",
-  "48901": "Ajoute le sort suivant à votre deck :",
-  "44780": "Fumeron Nécromique",
-  "28219": "Ajoute le sort suivant à votre deck :",
-  "71493": "Pyrobraise Nécromique",
-  "73081": "Ajoute le sort suivant à votre deck :",
-  "41045": "Fournaise Nécromique",
-  "94222": "Ajoute le sort suivant à votre deck :",
-  "78589": "Moellon Nécromique",
-  "85619": "Ajoute le sort suivant à votre deck :",
-  "39377": "Brisure Nécromique",
-  "86253": "Ajoute le sort suivant à votre deck :",
-  "89148": "Agglomerat Nécromique",
-  "38090": "Ajoute le sort suivant à votre deck :",
-  "85117": "Ablution Nécromique",
-  "34720": "Ajoute le sort suivant à votre deck :",
-  "31635": "Draineuse Nécromique",
-  "93314": "Ajoute le sort suivant à votre deck :",
-  "83833": "Exsudante Nécromique",
-  "40155": "Ajoute le sort suivant à votre deck :",
-  "66601": "L\u0027Ann\u0027Eau",
-  "29668": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: {addWater:j}.\n\\---\n+{value:h}% aux Soins.",
-  "94154": "Anneau Carina",
-  "57510": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: {addAir:j}.\n\\---\n+{value:(dodge/10)}% à l\u0027Esquive.",
-  "98893": "Anneau Deter",
-  "83153": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: {addEarth:j}.\n\\---\n+{value:ar}% aux gains d\u0019\u0027{%ar}.",
-  "26921": "Anneau Bstiné",
-  "94463": "+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:at}% aux gains d\u0027{%at}.",
+  "96796": "Anneau du QA",
+  "70085": "Cet anneau a la réputation de rendre son porteur infiniment plus pertinent.",
   "60605": "Anneau Bligé",
   "19853": "Quand l\u0027un de vos compagnons ou invocations meurt, il déclenche {explosion:ex}.\n\\---\n+{value:dmgM}% aux dégâts magiques.",
-  "37293": "Anneau Dylderay",
-  "64566": "Réduit de 1\\_{%pa} le coût de votre prochain sort quand vous utilisez votre réserve.\\v(Limité à {value:limit} fois par tour)\n\\---\n+{value:dmgM}% aux dégâts des Sorts.\n+{value:(ccM/10)}% de CC des Sorts.",
-  "82174": "Anneau Tilus",
-  "7453": "Ajoute {addReserve:r} quand vous jouez 3\\_sorts dans le même tour.\\v(Limité à {value:limit} fois par tour)\n\\---\n+{value:pdv}% aux {%pv} max.\n+{value:dmgM}% aux dégâts des Sorts.",
-  "90960": "Ploutrozorus",
-  "56283": "Un compagnon mort aléatoire peut être réinvoqué quand vous achevez un adversaire.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.\n+{value:(ccM/10)}% de CC des Sorts.\n+{value:dccM}% aux dégâts CC des Sorts.",
+  "90960": "Le Ploutrozorus",
+  "56283": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Invoque un {Summoning:36} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.",
   "71255": "Anneau Mali",
   "57081": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Convertit vos points de jauges élémentaires en points de jauge NEUTRE\u003csprite name\u003dneutral\u003e.",
-  "15967": "Anneau Rizon",
-  "63435": "Augmente la portée d\u0027invocation de vos compagnons autour\\_\u003csprite name\u003dcell_around\u003e de votre héros de {cell:c}.\n\\---\n+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:h}% aux Soins.",
-  "86775": "Anneau Cultant",
-  "81587": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: Confère +{armor:ar} à votre héros s\u0027il a un adversaire autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\\---\n+{value:pdv}% aux {%pv} max.\n+{value:at}% aux gains d\u0027{%at}.",
-  "33892": "Muscapol",
-  "63935": "Ajoute {addReserve:r} quand vous jouez un sort coûtant 2\\_{%pa} ou moins.\\v(Limité à {value:limit} fois par tour)\n\\---\n+{value:pdv}% aux {%pv} max.\n+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:(ccP/10)}% de CC d\u0027Arme.",
   "54540": "Le Kamard",
-  "4744": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Invoque un {Summoning:196} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\n+{value:pdv}% aux {%pv} max.\n+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:dmgM}% aux dégâts des Sorts.\n+{value:kam}% aux Drops de Kamas.",
-  "66508": "Anneau Verbouké",
-  "21877": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Piochez 1\\_sort. Son coût est réduit de 1\\_{%pa}.\n\\---\n+{value:(ccM/10)}% de CC des Sorts.",
-  "40651": "Anneau Klerdlalune",
-  "22085": "Votre héros gagne +{attackBoost:at} et +{armor:ar} quand tous vos compagnons sont morts.\n\\---\n+{value:pdv}% aux {%pv} max.",
-  "24603": "Anneau Rajone",
-  "59875": "Confère +{attackBoost:at} à votre héros tant que vous n\u0027avez qu\u0027un seul compagnon en jeu.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
-  "59088": "Anneau Lémain",
-  "74524": "Confère +{armor:ar} à votre héros quand vous jouez un sort coûtant au moins 5\\_{%pa}.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
-  "19299": "Anneau Rak",
-  "27108": "+{value:pdv}% aux {%pv} max.\n+{value:ar}% aux gains d\u0027{%ar}.\n+{value:(resP/10)}% de résist. Physique.",
-  "52856": "Anneau Tomatik",
-  "25336": "Double le {%bl} des mécanismes que vous construisez ou transformez.\n\\---\n+{value:(ccM/10)}% de CC des Sorts.",
-  "79921": "Anneau Réo",
-  "21700": "Quand un compagnon allié coûtant au moins 5\\_jauges est invoqué, il déclenche {explosion:x}.\n\\---\n+{value:dccM}% aux dégâts CC des Sorts.",
-  "35144": "Anneau Bélisk",
-  "80318": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Votre héros déclenche {explosion:x}.\n\\---\n+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:(resP/10)}% de résist. Physique.",
-  "62697": "Anneau Pital",
-  "46695": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: Soigne votre héros de {heal:pv}.\n\\---\n+{value:pdv}% aux {%pv} max.\n+{value:h}% aux Soins.",
-  "32696": "Anneau Nymousse",
-  "97558": "Ajoute {addReserve:r} quand un compagnon ou une invocation alliée achève un adversaire.\n\\---\n+{value:ar}% aux gains d\u0027{%ar}.\n+{value:h}% aux Soins.",
-  "43610": "Anneau Busier",
-  "1910": "Réduit de 2\\_{%pa} le coût de votre prochain sort quand un compagnon allié est invoqué.\n\\---\n+{value:(ccM/10)}% de CC des Sorts.\n+{value:dccM}% aux dégâts CC des Sorts.",
-  "32896": "Anneau Marchetif",
-  "34117": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e à l\u0027adversaire ayant le plus de {%pv}.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
+  "4744": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Invoque un {Summoning:196} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.",
+  "32896": "Anneau Marchétif",
+  "34117": "Votre héros applique {frozen:PropertyEffect.26.FrozenDmg} quand il attaque une cible avec l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet/\u003e.",
   "89141": "Anneau Ptimâle",
-  "5806": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e à l\u0027adversaire ayant le plus de {%pv}.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
+  "5806": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated/\u003e à l\u0027adversaire ayant le plus de {%pv}.",
   "43425": "Anneau Problemo",
-  "86615": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e à l\u0027adversaire ayant le plus de {%pv}.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
-  "42829": "Anneau Pignatre",
-  "97048": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e à l\u0027adversaire ayant le plus de {%pv}.\n\\---\n+{value:dmgM}% aux dégâts des Sorts.",
-  "83467": "Anneau Ph\u0027Tal\u0027Mo",
-  "85172": "+{value:dmgM}% aux dégâts des Sorts.\n+{value:(ccM/10)}% de CC des Sorts.\n+{value:dccM}% aux dégâts CC des Sorts.",
-  "69755": "Anneau Bsaine",
-  "3237": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: Confère +{attackBoost:atk} pour le tour à votre héros s\u0027il a un adversaire autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\\---\n+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:at}% aux gains d\u0027{%at}.",
-  "6859": "On dit que cet anneau a le pouvoir d\u0027envoûter son porteur et de le posséder jusqu\u0027à le conduire frénétiquement jusqu\u0027à sa perte. Parmi ceux qui lui ont survécu, la plupart ne s\u0027en sont toujours pas remis. Mais qu\u0027est-ce que la folie de l\u0027esprit, quand la puissance vous est offerte ?",
-  "11673": "Léger comme l\u0027air, redoutable comme le vent, cet anneau vous donnera l\u0027impression qu\u0027une douce brise vous chatouille gentiment les doigts.",
-  "87775": "Ce poulpe n\u0027a subi aucune violence lors de la fabrication de cet anneau. Selon nos sources, il aurait même déclaré être très heureux de vivre sa meilleure vie en tant qu\u0027anneau. Une belle leçon à retenir.",
-  "44362": "Un anneau de caractère forgé sur des terres austères par des dignitaires totalitaires aux motivations profondément délétères. Une belle affaire pour son propriétaire !",
-  "27131": "On dit qu\u0027une seule petite goutte de cet anneau suffit à augmenter la longévité du guerrier qui la boit. Le problème, c\u0027est que personne n\u0027a jamais réussi à le débouchonner.",
-  "86950": "Gardez constamment un œil sur les porteurs de cet anneau\\_; ils seraient bien capables de vous faire un enfant dans le dos.",
-  "26464": "Quitte à avoir ce bijou, autant sortir un peu de chez vous.",
-  "17091": "Ce petit anneau ne vous rendra pas plus sexy mais vous ouvrira certainement l’appétit.",
-  "96142": "Rarement conviés aux soirées mondaines, les porteurs de l’anneau Strogote pourront toujours se consoler en brisant des os. Pas de jugement, on s’amuse comme on peut.",
-  "75453": "Méfiez-vous, ce petit bijou en métal précieux pourrait bien vous brûler les doigts.",
-  "8763": "Une fois équipé, il vous sera difficile de l’ôter de votre doigt.",
-  "99303": "Promis, vous en ferez pleurer plus d’un avec cet anneau. A cause des coups ou de l’odeur, ça en revanche, ça ne dépendra que de vous.",
-  "73068": "Entre les drops, les donjons et les quêtes en tout genre, il va bien falloir trouver un moment pour vous briquer l’anneau.",
-  "41158": "Ce petit signe d’excellence, même s’il n’est pas le plus puissant, a au moins le mérite d’être particulièrement flatteur à votre doigt. C’est toujours ça de pris.",
-  "36049": "Un anneau qui ne vous permettra pas de briller de mille feux, mais qui pourrait bien assombrir le futur de vos adversaires...",
-  "26579": "Faites moi plaisir, vous êtes un héros... ou au moins un aventurier ! Alors laissez cette tasse de lait, ce n’est pas encore l’heure du goûter\\_!!!",
-  "55875": "Ses porteurs meurent souvent abattus par des jets de bottes en plein crâne. En même temps, si vous alliez dropper vos plumes plutôt que de chanturler\\_la nuit pour en réclamer, ça n’arriverait pas.",
-  "1294": "On raconte que cet anneau provoquerait chez son propriétaire un besoin vital de porter des peaux de Wabbits et des maillots de bain. Quand c’est en même temps, le résultat gratte un peu.",
-  "49248": "♬Who, who, who, who\u000b\t\t        Who, who, who,\u000b\t\t        Who... ♬    Oh, pardon.",
-  "35263": "Allez on répète, tous après moi\\_: «\\_Ce petit accessoire bien sympathique n’est qu’un anneau, le coup ne PEUT PAS partir tout seul\\_».",
+  "86615": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled/\u003e à l\u0027adversaire ayant le plus de {%pv}.",
+  "59675": "\u003cReplacePlaceholder\u003e",
+  "87775": "Ce poulpe n\u0027a subi aucune violence lors de la fabrication de cet anneau. Selon nos sources, il aurait même déclaré être «\\_très heureux de vivre sa meilleure vie en tant qu\u0027anneau\\_». Une belle leçon à retenir.",
+  "99303": "Promis, vous en ferez pleurer plus d\u0027un avec cet anneau. À cause des coups ou de l\u0027odeur, ça en revanche, ça ne dépendra que de vous.",
   "71843": "Qui êtes-vous pour juger ? C’est la question mille fois posée par cet\\_étrange homme qui vivait près de sa marre aux canards. Il marchait et nageait comme un canard et était même parvenu un jour à se casser trois pattes. Sa passion pour ces aquatiques oiseaux au large bec jaune et aplati dépassait la simple collection, si bien qu’à sa mort, des millions de tristes «\\_coin-coin\\_» se sont élevés jusqu’à toucher le cœur des dieux.",
-  "93173": "Les tétons pointent et vos muscles se gonflent sous votre chemise en lin... Vos bottes vous serrent soudainement au niveau des mollets et clairement vous comprenez qu’il va vous falloir vider votre bourse pour quelques nouveaux slips. Toutes ces agréables sensations vous sont procurées par l’anneau que vous venez d’équiper, le Muscapol.\nForgé dans les muscles d’un chasseur redoutable, il vous est conseillé de couvrir votre nouveau corps pour éviter de faire tourner la tête de votre entourage.",
   "55561": "Malgré un nom des plus effrayants, la créature qui a inspiré cet anneau était la plus douce du Monde des Douze.\nIl faut dire que ses sept centimètres de hauteur ne lui offraient pas forcément beaucoup d’autres options. A part peut-être la magie...",
-  "75332": "«\\_Juste un doigt\\_». Voici, selon sa célèbre créatrice Dylderay, tout ce dont vous aurez besoin pour jouir pleinement des pouvoirs de ce puissant anneau.",
-  "27382": "On ne vous mènera pas en bateau, il ne servira à rien d’avoir le pied marin pour utiliser cet anneau. A moins de le porter à l’orteil\\_?",
   "18329": "Cet étrange anneau est le cauchemar de tout Iop qui se respecte. Il leur est en effet impossible de le regarder sans devenir fou.\nPour ceux qui ont un cerveau, évidemment. Et cet anneau... Bon, en fait ça ne concerne que très peu de Iops.",
-  "18052": "«\\_Horizon pas net, reste à la buvette\\_!\\_» Franchement, en matière de conseil hautement constructif, on ne saurait faire plus simple et élaboré à la fois. Maître Dada n’a qu’à bien se tenir. On pourrait même conclure par\\_: «\\_Si malgré tout vous n’en faîtes qu’à votre tête, ne vous étonnez pas de finir en carpette\\_!\\_». L’anneau vous aura prévenu.",
-  "73495": "Un petit bijou qui vous dotera d’une bonne force de frappe supplémentaire, et d’un amour passionnel pour les grosses pierres inutiles, le bacon et les chienchiens.",
-  "23767": "Un bel accessoire qui pourrait bien vous aider à cacher votre jeu à vos adversaires... A condition d’avoir un jeu à cacher bien entendu, ça reste un anneau après tout.",
-  "10024": "Cet anneau a déjà coupé de nombreux doigts. Prenez garde aux vôtres.",
-  "57502": "Oubliez la dentelle, la porcelaine et les détails et foncez.",
-  "57401": "Un puissant anneau... enfin on l’espère, car le prix à payer pour pouvoir le porter est assez lourd. Comme la perte du respect de vos adversaires par exemple. Et de votre dignité. Et d’une vie amoureuse. Ou juste sociale. Oui, donc cet anneau est forcément puissant. Forcément.",
-  "4385": "Grâce à cet anneau, même le plus miro des aventuriers pourra toucher sa cible. Sauf s’il fait partie de la catégorie des vraiment malchanceux qui sont manchots en plus.",
-  "65595": "Quand on vous dit de sortir couvert pour ne pas prendre froid, ce n’est pas juste en portant cet anneau...",
   "47510": "",
   "97079": "Anneau Bligé",
   "39368": "Quand l\u0027un de vos compagnons ou invocations meurt, il déclenche {explosion:ex}.\n\\---\n+{value:dmgM}% aux dégâts magiques.",
   "57193": "Détruit cet equipement pour récupérer des fragments.",
-  "3698": "Les porteurs de cet anneau ont tendance à se montrer désagrables lorsqu\u0027on les contredit. Vous êtes prévenu.",
   "58988": "Cet anneau vous permettra de tout réussir, même si vous échouez !",
   "20519": "Ce n\u0027est pas la taille de l\u0027anneau qui compte, c\u0027est ce qu\u0027on en fait.",
-  "78614": "Cet anneau n\u0027est ni plus ni moins qu\u0027un magnifique corail taillé avec soin. Qu\u0027avez-vous donc bien pu imaginer ?!",
-  "41300": "Avez-vous déjà vu : une bague faite entièrement d\u0027eau ?\nMaintenant, oui.",
-  "40243": "On connait bien peu de choses sur cet étrange anneau ; d\u0027aucun disent qu\u0027il serait issu de la collection personnelle d\u0027un illustre inconnu, d\u0027autres qu\u0027il était le symbole d\u0027un groupuscule de Roublards sans grande ambition. Quoiqu\u0027il en soit, ça ne vous empêche pas de le porter, mais il est déconseillé de l\u0027exhiber.",
-  "58245": "Ne vous méprenez pas, cet anneau n\u0027est pas qu\u0027un vulgaire bandage pour doigt cassé. Non, c\u0027est bien plus que ça. Oui, bien plus.",
-  "87240": "D\u0027accord, cet anneau n\u0027a rien de transcendant, mais méritait-il pour autant son nom ?\nPeut-on dire d\u0027un anneau qu\u0027il dispose d\u0027une âme, en tant qu\u0027objet ?\nLes pouvoirs d\u0027un anneau peuvent-ils se voir affectés par l\u0027image que son porteur lui prête ?\nVous avez 4 heures.",
-  "66980": "Anneau Rible",
-  "88900": "+{value:pdv}% aux {%pv} max.\n+{value:dmgP}% aux dégâts d\u0027Arme.",
   "32836": "Parce qu\u0027on peut s\u0027adonner au plaisir des combats et du nettoyage de donjon sans être une brute épaisse, il y a cet anneau.",
   "64912": "Anneau Zamour",
-  "65868": "+{value:pdv}% aux {%pv} max.\n+{value:dmgM}% aux dégâts des Sorts.",
-  "16980": "Etrangement, les porteurs de cet anneau sont fréquemment pris d\u0027envie de fredonner à tue-tête des no no no no. Heureusement, il ne s\u0027agit pas d\u0027un mal très dommageable, excepté pour leur entourage.",
-  "96424": "Anneau Nolimit",
-  "68203": "+{value:pdv}% aux {%pv} max.\n+{value:loot}% aux Drops d\u0027Objets.",
-  "80716": "Même s\u0027il n\u0027est qu\u0027en fer, c\u0027est tout de même un beau cadeau qui vous est là offert.",
-  "46039": "Anneau Fer",
-  "64334": "+{value:pdv}% aux {%pv} max.\n+{value:ar}% aux gains d\u0019\u0027{%ar}.",
+  "65868": "+{value:pdv}% aux {%pv} max.\n(+ 0.3% par niveau)\n\\---\n+{value:dmgM}% aux dégâts magiques.\n(+ 0.2% par niveau)",
   "97975": "Un bijou qui vous siéra à merveille et qui vous aidera même à vous diriger en mer, si vous savez y faire.",
   "21894": "Anneau Céan",
-  "37540": "+{value:pdv}% aux {%pv} max.\n+{value:at}% aux gains d\u0027{%at}.",
-  "38466": "Cet anneau vous permettra assurément d\u0027affronter vos ennemis bien calmement.",
-  "71425": "Anneau KLM",
-  "36378": "+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:ar}% aux gains d\u0019\u0027{%ar}.",
-  "27319": "Cette bague laissera des marques inoubliables sur les adversaires que vous cognerez avec.",
-  "77284": "Anneau Fensif",
-  "7540": "+{value:dmgM}% aux dégâts des Sorts.\n+{value:at}% aux gains d\u0027{%at}.",
-  "80844": "Oh lé lé, Oh la la, quand il faut y aller, on est toujours là !",
-  "92781": "Anneau Lélé",
-  "46304": "+{value:dmgP}% aux dégâts d\u0027Arme.\n+{value:(resP/10)}% de résist. Physique.",
-  "50164": "Le pouvoir de cet anneau à la fabrication unique réside dans la précision de sa cuisson. Attention, il est encore chaud.",
-  "86637": "Bague Hette",
-  "89151": "+{value:dmgM}% aux dégâts des Sorts.\n+{value:(resM/10)}% de résist. Magique.",
+  "37540": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet/\u003e à l\u0027adversaire ayant le plus de {%pv}.",
   "3219": "Avec tout ce que cet anneau vous apportera, il vous faudra au moins plusieurs coffres pour cacher votre opulence.",
   "87270": "Anneau Pulant",
-  "9586": "+{value:kam}% aux Drops de Kamas.\n+{value:loot}% aux Drops d\u0027Objets.",
+  "9586": "+{value:loot}% au drop d\u0027objets sur les monstres.\n(+ 0.2% par niveau)\\v\\---\n+{value:kam}% de kamas obtenus sur les monstres.\n(+ 0.1% par niveau)",
   "66177": "",
   "55132": "",
   "10205": "",
@@ -868,5 +530,278 @@
   "61154": "",
   "260991": "",
   "30181": "",
-  "4264": ""
-}
\ No newline at end of file
+  "4264": "",
+  "86902": "",
+  "26921": "Anneau bstiné",
+  "94463": "+{value:att}% aux dégâts physiques.",
+  "6859": "Non, ce n\u0027est pas une bague, c\u0027est un anneau ! UN ANNEAU !!!",
+  "60541": "",
+  "52327": "Anneau d\u0027Artifice",
+  "96032": "Déclenche {value:proc} \u003cb\u003eÉTINCELLES MAGIQUES\u003c/b\u003e infligeant {value:dmg} sur des adversaires aléatoires quand un compagnon allié est détruit.",
+  "54001": "Un puissant anneau... enfin on l\u0027espère, car le prix à payer pour pouvoir le porter est assez lourd. Comme la perte du respect de vos adversaires par exemple. Et de votre dignité. Et d\u0027une vie amoureuse. Ou juste sociale. Oui, donc cet anneau est forcément puissant. Forcément.",
+  "96367": "Anneau Bsaine",
+  "70330": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e à l\u0027adversaire ayant le plus de {%pv}.",
+  "993": "Avez-vous déjà vu : une bague faite entièrement d\u0027eau ? Maintenant, oui.",
+  "17833": "Ann\u0027eau",
+  "1147": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: ajoute {addWater:value}.",
+  "58027": "",
+  "36692": "Anneau Sferatu",
+  "98912": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Un \u003cb\u003eSFERATU\u003c/b\u003e inflige {value:dmg} dégâts à un personnage aléatoire.",
+  "12078": "Si vous cherchez un anneau alliant finesse et efficacité, vous l\u0027avez trouvé ! Ce petit bijou 100% naturel dégage une envoûtante odeur qui saura adoucir le plus dur des cœurs... avant de lui asséner le coup de grâce !",
+  "85768": "Un anneau à conserver bien au frais, à l\u0027écart de toute lumière, sous peine de consumation instantanée. Article ni repris, ni échangé.",
+  "29566": "Anneau Breux",
+  "57484": "{#DEATHBLOW}\\_:  Applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e aux adversaires autour \u003csprite name\u003dcell_around\u003e de la cible.\n\\---\n+{value:pdmg}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "99580": "Cet anneau n\u0027est sans doute pas des plus agréables à porter, mais il est sans conteste des plus stylés ! A vous de définir vos priorités.",
+  "63247": "Anneau Ragan",
+  "59942": "{#DEATHBLOW}\\_:  Applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e aux adversaires autour \u003csprite name\u003dcell_around\u003e de la cible.\n\\---\n+{value:pdmg}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "46667": "Bien qu\u0027il se porte au doigt, cet anneau vous aidera à y voir plus clair.",
+  "93692": "Anneau Culaire",
+  "8899": "Tant que votre héros possède de l\u0027{%ar}, ses attaques appliquent \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e.\n\\---\n+{value:(Pres/10)}% de résistances physiques.\n(+ 5% par niveau)",
+  "18935": "Ne vous laissez pas mener en bateau, il ne servira à rien d\u0027avoir le pied marin pour utiliser cet anneau. A moins de le porter à l\u0027orteil ?",
+  "78428": "Anneau Tilus",
+  "49290": "\u003cb\u003eATTAQUE\u003c/b\u003e : {value:(valueA/10)}% de chances de gagner {addWater:valueB}.\\v\\---\n+{value:valueC}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "22985": "Deux cordes valent mieux qu\u0027une, même si en l\u0027occurrence, elles s\u0027avèrent peu pratiques.",
+  "85815": "Anneau Rhomého",
+  "5342": "\u003cb\u003eATTAQUE\u003c/b\u003e : {value:(padd/10)}% de chances de gagner {addFire:fg}.\\v\\---\n+{value:valueC}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "91097": "Vous ne ferez pas dans la dentelle avec cet anneau. Vous vous attendiez à autre chose ?",
+  "84944": "Anneau Barbare",
+  "60382": "\u003cb\u003eATTAQUE\u003c/b\u003e : {value:(pg/10)}% de chance de gagner {addEarth:nbg}.\\v\\---\n+{value:ppow}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "27915": "À première vue, cet anneau paraît insignifiant, mais il recèle en réalité un grand pouvoir.",
+  "33080": "Anneau Din",
+  "38647": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {value:(padd/10)}% de chances de gagner {addAir:nbg}\\v\\---\n+{value:ppow}% de dégâts physiques.\n(+ 0.5% par niveau)",
+  "19391": "Taillé avec précision, cet anneau saura relever vos combats jusqu\u0027ici un peu fadas.",
+  "4397": "Anneau Rigan",
+  "74226": "Ajoute {addWater:nbg} quand vous jouez un sort EAU\u003csprite name\u003dwater/\u003e coûtant {value:pacost} {%PA} ou plus.\\v\\---\n+{value:mpow}% de dégâts magiques.\n(+ 0.5% par niveau)",
+  "29262": "« Horizon pas net, reste à la buvette ! ». Franchement, en matière de conseil hautement constructif, on ne saurait faire plus simple et élaboré à la fois. Maître Dada n\u0027a qu\u0027à bien se tenir. On pourrait même conclure par : « Si vous n\u0027en faites qu\u0027à votre tête, ne vous étonnez pas de finir en carpette ! ». L\u0027anneau vous aura prévenu.",
+  "68142": "Anneau Rizon",
+  "19114": "Ajoute {addAir:nbg} quand vous jouez un sort AIR\u003csprite name\u003dwind/\u003e coûtant {value:pacost} {%PA} ou plus.\\v\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "52314": "La rumeur dit qu\u0027en sertissant cet anneau des os de vos ennemis, vous absorberez leur puissance passée. En réalité, vous attirerez surtout les chienchiens, mais libre à vous d\u0027essayer.",
+  "36076": "Anneau Steo",
+  "89476": "Gagne {addEarth:nbg} quand vous jouez un sort TERRE\u003csprite name\u003dearth/\u003e coûtant {value:PAcost} {%PA} ou plus.\\v\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "89552": "Ne vous y trompez pas : la simple facture de cet anneau renferme en réalité le pouvoir d\u0027attiser les flammes de l\u0027enfer qui sommeillent en vous ! C\u0027est en tout cas ce que les vendeurs en disent.",
+  "98882": "Anneau Fuego",
+  "16717": "Ajoute {addFire:valueA} quand vous jouez un sort FEU\u003csprite name\u003dfire/\u003e coûtant {value:pacost} {%PA} ou plus.\\v\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "66246": "Ce petit signe d\u0027excellence, même s\u0027il n\u0027est pas le plus puissant, a au moins le mérite d\u0027être particulièrement flatteur à votre doigt. C\u0027est toujours ça de pris.",
+  "15449": "Anneau Rifique",
+  "85030": "+{value:pp}% dégats physiques par \u003cb\u003eAURA\u003c/b\u003e actives.\n\\---\n+{value:ppow}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "68712": "Ses porteurs meurent souvent abattus par des jets de bottes en plein crâne. En même temps, si vous alliez dropper vos plumes plutôt que de chanturler la nuit pour en récmamer, ça n\u0027arriverait pas.",
+  "59265": "Anneau Klerdlalune",
+  "74157": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: +{value:nba} \u003cb\u003eAURA\u003c/b\u003e à votre héros s\u0027il en possède déjà une.\\v\\---\n+{value:pv}% aux {%pv} max.\n(+ 0.5% par niveau)",
+  "83898": "On dit qu\u0027une seule petite goutte de cet anneau suffit à augmenter la longévité du guerrier qui la boit. Le problème, c\u0027est que personne n\u0027a jamais réussi à le débouchonner.",
+  "19805": "Anneau Devie",
+  "82990": "Quand votre héros gagne une \u003cb\u003eAURA\u003c/b\u003e, il se soigne de {heal:soin}.\\v\\---\n+{value:ar}% aux gains d\u0027{%AR}.\n(+ 0.5% par niveau)",
+  "37357": "Fiez-vous à cet anneau, il vous guidera dans la bonne direction. La plupart du temps.",
+  "4110": "Anneau Racle",
+  "85151": "+{value:dmg}% aux dégâts de vos \u003cb\u003eAURAS\u003c/b\u003e.\n(+2% par niveau)",
+  "2939": "Un anneau taillé pour les champions ! Ou en tout cas, ceux qui pensent l\u0027être.",
+  "8893": "Anneau Lympique",
+  "99935": "+ {value:life} {%pv} max.\n\\---\n+{attackBoost:Att}",
+  "8617": "Cet anneau vous aidera à écrire la suite de vos aventures, mais ne vous préservera pas d\u0027une fin tragique.",
+  "84207": "Anneau Thello",
+  "4586": "+{value:(pres/10)}% de résistance magique.\n(+ 3% par niveau)\n\\---\n+{value:(mres/10)}% de résistance physique.\n(+ 2% par niveau)",
+  "84692": "« Oh lé lé, Oh la la, quand il faut y aller, on est toujours là ! »",
+  "64346": "Anneau Lélé",
+  "98911": "+{value:(pres/10)}% de résistance physique.\n(+ 3% par niveau)\n\\---\n+{value:(mres/10)}% de résistance magique.\n(+ 2% par niveau)",
+  "40688": "Même s\u0027il n\u0027est qu\u0027en fer, c\u0027est tout de même un beau cadeau qui vous est offert.",
+  "7995": "Anneau Fer",
+  "89454": "+{attackBoost:ar}\n\\---\n+{value:hp}  {%pv} max.",
+  "49237": "« Osez faire entendre votre voix ! ». C\u0027est certainement ce que cet anneau vous dirait, s\u0027il pouvait parler.",
+  "94116": "D\u0027accord, cet anneau n\u0027a rien de transcendant, mais méritait-il pour autant son nom ?\nPeut-on dire d\u0027un anneau qu\u0027il dispose d\u0027une âme, en tant qu\u0027objet ?\nLes pouvoirs d\u0027un anneau peuvent-ils se voir affectés par l\u0027image que son porteur lui prête ?\nVous avez 4 heures.",
+  "53531": "Anneau Rible",
+  "83470": "+{value:pp}% aux dégâts physiques.\n(+ 0.3% par niveau)\n\\---\n+{value:hp}% aux {%pv}max.\n(+ 0.2% par niveau)",
+  "93355": "Ne vous méprenez pas, cet anneau n\u0027est pas qu\u0027un vulgaire bandage pour doigt cassé. Non, c\u0027est bien plus que ça. Oui, bien plus.",
+  "69699": "Certains bijoutiers sont de véritables artistes. D\u0027autres, non.",
+  "51126": "Anneau Lybrius",
+  "78443": "+{value:mp}% aux dégâts magiques.\n(+ 0.3% par niveau)\n\\---\n+{value:hp}% aux {%pv}max.\n(+ 0.2% par niveau)",
+  "84726": "Il a été fabriqué par des mains agiles. Sauriez-vous reproduire une telle oeuvre ?",
+  "21307": "Anneau Bli",
+  "6780": "+{value:(ccm/10)}% aux dégâts critiques magiques.\n(+ 1.2% par niveau)\n\\---\n+{value:xp}% aux gains d\u0027expérience.\n(+ 0.1% par niveau)",
+  "47590": "Cet anneau est aussi moche qu\u0027il est dangereux. Si les goûts et les couleurs ne se discutent pas, il n\u0027en reste pas moins destructeur au doigt d\u0027un homme imprudent.",
+  "42510": "Anneau Siff",
+  "27163": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 3% par niveau)\n\\---\n+{value:xp}% aux gains d\u0027expérience sur les monstres.\n(+ 0.1% par niveau)",
+  "48238": "Cet anneau vous propulsera au cœur des combats. Atterrissage non garanti. Assurance vie en sus.",
+  "91825": "Anneau Ktane",
+  "85582": "+{value:mpow}% aux dégâts magiques.\n(+ 0.3% par niveau)\n\\---\n+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 2% par niveau)",
+  "20895": "Si vous vous sentez à l\u0027étroit, c\u0027est normal. Tâchez de vous relaxer. Bientôt, vous vous sentirez bien mieux !",
+  "83767": "Anneau Maso",
+  "43126": "+{value:(pres/10)}% de résistance physique.\n(+ 3% par niveau)\n\\---\n+{value:heal}% aux soins.\n(+ 0.2% par niveau)",
+  "38556": "Une fois équipé, il vous sera difficile de l\u0027ôter de votre doigt.",
+  "19477": "Anneau Kupant",
+  "65624": "+{value:ar}% aux gains d\u0027{%ar}.\n(+ 0.3% par niveau)\n+{value:heal}% aux soins.\n(+ 0.2% par niveau)",
+  "67034": "Cet anneau, aussi fragile que léger, pourrait bien vous aider à déployer vos ailes. Ou au contraire, vous claquer dans les doigts.",
+  "81977": "Anneau Papyon",
+  "71168": "+{value:pv}% aux {%pv}max.\n(+ 0.3% par niveau)\n\\---\n+{value:xp}% aux gains d\u0027expérience.\n(+ 0.1% par niveau)",
+  "70975": "Entre les drops, les donjons et les quêtes en tout genre, il va bien falloir trouver un moment pour vous briquer l\u0027anneau.",
+  "56891": "Anneau Verbouké",
+  "92496": "+{value:pv} {%pv} max.\n\\---\n+{value:xp}% aux gains d\u0027expérience.\n(+ 0.1% par niveau)",
+  "59534": "Une bonne dose de stimulant pour être encore plus fort. Ce n\u0027est pas de la triche, c\u0027est de l\u0027optimisation !",
+  "7400": "Anneau R\u0027mone",
+  "91910": "+{value:ex}% aux dégâts d\u0027{#explosion}.\n(+ 0.3% par niveau)\n\\---\n+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 2% par niveau)",
+  "3285": "Étrangement, les porteurs de cet anneau sont fréquemment pris d\u0027envie de fredonner à tue-tête des no no no no. Heureusement, il ne s\u0027agit pas d\u0027un mal très dommageable, excepté pour leur entourage.",
+  "95983": "Anneau Nolimit",
+  "38523": "+{value:ppow}% de dégâts physiques par niveau de votre héros.\n(+ 0.3% par niveau)\n\\---\n+{value:loot}% au drop d\u0027objets sur les monstres.\n(+ 0.1% par niveau)",
+  "10219": "",
+  "84199": "",
+  "48326": "",
+  "97049": "",
+  "60947": "",
+  "12722": "",
+  "21215": "",
+  "82981": "",
+  "95495": "",
+  "79630": "",
+  "92190": "",
+  "94505": "",
+  "53339": "Cette bague laissera des marques inoubliables sur les adversaires que vous cognerez avec.",
+  "27966": "Anneau Fensif",
+  "28245": "+{value:col}% aux dégâts de {#COLLISION}.\n(+ 0.3% par niveau)\n\\---\n+{value:ccp}% de chance d\u0027effectuer des critiques physiques.\n(+ 2% par niveau)",
+  "98110": "Avec cet anneau, évitez de vendre la mèche !",
+  "25246": "Anneau Lala",
+  "10569": "+{value:ex}% dégâts d\u0027{#EXPLOSION}.\n(+ 0.3% par niveau)\n\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.2% par niveau)",
+  "79260": "Un anneau taillé pour les opérations de grande envergure, quelle que soit votre dextérité.",
+  "26489": "Ouvrez grand les yeux et voyez ce qui se profile devant vous... Essayez de deviner, au moins...",
+  "84434": "Anneau Stradamus",
+  "58265": "+{value:col}% aux dégâts de {#COLLISION}.\n(+ 0.3% par niveau)\n\\---\n+{value:ppow}% aux dégâts physiques.\n(+ 0.2% par niveau)",
+  "98369": "On raconte que cet anneau provoquerait chez son propriétaire un besoin vital de porter des peaux de Wabbits et des maillots de bain. Quand c\u0027est en même temps, le résultat gratte un peu.",
+  "91319": "Anneau Lémain",
+  "64712": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Confère +{armor:ar} à votre héros par compagnon allié en jeu.\\v\\---\n+{value:var}% aux gains d\u0027{%ar}\n(+ 0.5% par niveau)",
+  "7485": "L\u0027anneau d\u0027un bandit très réputé avant qu\u0027il ne se fasse rattraper par son passé de rempailleur de chaise.",
+  "21239": "Anneau Relaloi",
+  "41171": "\u003cb\u003eATTAQUE\u003c/b\u003e : gagne +{armor:ar}.\\v\\---\n+{value:pv}% aux {%pv} max.\n(+ 0.5% par niveau)",
+  "877": "Anneau Kulus",
+  "13902": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Confère +{armor:ar} par {%pa} de {%reserve} à votre héros.\\v\\---\n+{value:ppow}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "7231": "Si à chaque fois que vous perdez un combat ce n\u0027est pas votre faute mais celle de vos alliés, de votre arme ou de la météo, alors cet anneau est fait pour vous !",
+  "10907": "Anneau Rageux",
+  "34140": "{#DEATHBLOW}\\_:  Applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e aux adversaires autour \u003csprite name\u003dcell_around\u003e de la cible.\n\\---\n+{value:pdmg}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "70821": "On raconte que cet anneau renfermerait une infime parcelle du pouvoir d\u0027un ancien mage noir ; un Xélor dont on a oublié le nom.",
+  "8357": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute {addReserve:pa}.\n\\---\n+{value:(ccm/10)}% de chance d\u0027effecteur des critiques magiques.\n(+ 5% par niveau)",
+  "10462": "Anneau Recrux",
+  "92920": "Un anneau taillé avec précision. C\u0027est à peu près tout. Mais c\u0027est déjà bien.",
+  "83788": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: +{value:pa}\\_{%PA} à votre {%reserve}.\n\\---\n+{value:(Pres/10)}% de résistance physique.\n(+ 5% par niveau)",
+  "41794": "Anneau Yeton",
+  "44633": "Pour jouir pleinement du pouvoir de cet anneau, veillez à le porter quotidiennement afin de l\u0027abreuver jusqu\u0027à plus soif. Attention, risques de morsures.",
+  "81665": "Cet anneau vous permettra assurément d\u0027affronter vos ennemis bien calmement.",
+  "21924": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si vous avez au moins {value:nbsp} sorts en main, ajoute {addReserve:pa}.\n\\---\n+{value:(pcc/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 5% par niveau)",
+  "19403": "Anneau KLM",
+  "35081": "Un anneau qui ne vous permettra pas de briller de mille feux, mais qui pourrait bien assombrir le futur de vos adversaires.",
+  "23133": "Anneau Pake",
+  "68702": "+{value:life}% aux {%pv} max.\n(+ 0.3% par niveau)\n\\---\n+{value:(mres/10)}% de résistance magique.\n(+ 2% par niveau)",
+  "73461": "Ce petit anneau ne vous rendra pas plus sexy mais vous ouvrira certainement l\u0027appétit",
+  "76010": "Anneau Greuh",
+  "9752": "+{value:life}% aux {%pv} max.\n(+ 0.3% par niveau)\n\\---\n+{value:(pres/10)}% de résistance physique.\n(+ 2% par niveau)",
+  "84681": "Grâce à cet anneau, même le plus miro des aventuriers pourra toucher sa cible. Sauf s\u0027il fait partie de la catégorie des vraiment malchanceux qui sont manchots en plus.",
+  "7971": "Anneau Ph\u0027Tal\u0027Mo",
+  "50633": "Cet anneau a déjà coupé de nombreux doigts. Prenez garde aux vôtres.",
+  "88182": "Anneau Pinel",
+  "52517": "+{value:(pcc/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 3% par niveau)\n\\---\n+{value:(pdcc/10)}% aux dégâts des critiques physiques.\n(+ 0.8% par niveau)",
+  "37996": "Détrompez-vous, bien quil soit appétissant, cet anneau n\u0027est qu\u0027un anneau. UN ANNEAU.",
+  "54421": "Anneau Réo",
+  "85374": "La première fois du combat que votre héros atteint {value:nbA} \u003cb\u003eAURAS\u003c/b\u003e, il gagne {#SHIELD}.\\v\\---\n+{value:ppow}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "74629": "Porter cet anneau vous donnera un style unique, inexpliqué et inexplicable. C\u0027est toujours ça de pris.",
+  "41977": "Anneau Rak",
+  "27916": "Quand vous utilisez votre {%reserve}, confère +{armor:ar} par {%pa} consommé.\\v\\---\n+{value:pv}% aux {%PV} max.\n(+ 0.5% par niveau)",
+  "26073": "Un anneau qui te rend encore plus coriace que le plus coriace des coriaces.",
+  "49745": "Anneau Coriace",
+  "30816": "Donne {#BOUCLIER} si votre héros a 25 {%ar} ou plus.\n+{value:ar}% boost {%ar}",
+  "79341": "Allez on répète, après moi : « Ce petit accessoire bien sympathique n\u0027est qu\u0027un anneau, le coup ne PEUT PAS partir tout seul ».",
+  "485": "Anneau Tomatik",
+  "12972": "Confère +{armor:ar} à votre héros quand un \u003cb\u003eMÉCANISME\u003c/b\u003e allié ​est détruit.​\\v\\---\n+{value:mp}% aux dégâts magiques​.\n(+ 0.5% par niveau)",
+  "52261": "Laissez-vous porter, anneau au vent, vers vos meilleures aventures !",
+  "34335": "Anneau Dace",
+  "4304": "Ajoute {addEarth:ae} quand vous appliquez {#STUN[ASSOMMÉ]}.\n\\---\n+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 5% par niveau)",
+  "96155": "Un anneau pour ceux qui s\u0027opposent à tout le monde, même à ceux qui sont d\u0027accord avec eux.",
+  "11957": "Cet anneau n\u0027est ni plus ni moins qu\u0027un magnifique corail taillé avec soin. Qu\u0027avez-vous donc bien pu imaginer ?!",
+  "50539": "Un petit bijou qui vous dotera d\u0027une bonne force de frappe supplémentaire, et d\u0027un amour passionnel pour les grosses pierres inutiles, le bacon et les chienchiens.",
+  "91402": "Anneau Bélisk",
+  "67326": "{value:(padd/10)}% de chance d\u0027ajouter {addReserve:pa} quand vous appliquez {#STUN[ASSOMMÉ]}.\n\\---\n+{value:pmag}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "51252": "Le pouvoir de cet anneau à la fabrication unique réside dans la précision de sa cuisson. Attention, il est encore chaud.",
+  "93830": "Bague Hette",
+  "79543": "{value:(padd/10)}% de chance d\u0027ajouter {addFire:af} quand vous déclenchez {#EXPLOSION}.\n\\---\n+{value:ppow}% aux dégâts physiques.\n(+ 0.5% par niveau)",
+  "67955": "Oubliez la dentelle, la porcelaine et les détails et foncez.",
+  "96472": "Anneau Busier",
+  "99650": "{value:(pex/10)}% de chance que votre héros déclenche {explosion:ex} quand vous gagnez 1 jauge FEU\u003csprite name\u003dfire/\u003e.\n\\---\n+{value:exb}% dégâts d\u0027\u003cb\u003eEXPLOSION\u003c/b\u003e.\n(+ 0.5% par niveau)",
+  "10831": "♫Who, who, who, who\t\t        Who, who, who,\t\t        Who... ♫ Oh pardon.",
+  "12193": "Anneau Rajone",
+  "30466": "Quand une {#EXPLOSION} est déclenchée, confère {value:ppow}% de dégâts physiques à votre héros pour le tour.\n\\---\n+{value:(ccp/10)}% de chance d\u0027effectuer un critique physique.\n(+ 5% par niveau)",
+  "44111": "N\u0027oubliez pas de changer régulièrement la bague de doigt au risque de les perdre.",
+  "26411": "Bague Lagla",
+  "83112": "Ajoutez {addWater:aw} quand vous appliquez {#FROZEN[GELÉ]}.\n\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "49848": "La force est noire, c\u0027est noir comme cet anneau qui sert d\u0027étendard, tel un drapeau. Venez, basculez de son côté.",
+  "80566": "Anneau Bscur",
+  "4117": "{value:(perc/10)}% de chance d\u0027ajouter {addReserve:pa} quand vous appliquez {#FROZEN[GELÉ]}.\n\\---\n+{value:A}% dégâts de \u003cb\u003eGEL\u003c/b\u003e.\n(+ 0.5% par niveau)",
+  "64757": "Hey ho ho ho, et une bagouze de gnôle ! Hips.",
+  "25915": "Anneau Steké",
+  "92895": "Quand un de vos compagnons EAU\u003csprite name\u003dwater/\u003e est détruit, appliquez {frozen:PropertyEffect.26.FrozenDmg} à un adversaire aléatoire.\n\\---\n+{value:(A/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 5% par niveau)",
+  "59740": "Un bel accessoire qui pourrait bien vous aider à cacher votre jeu à vos adversaires... À condition d\u0027avoir un jeu à cacher bien entendu, ça reste un anneau après tout.",
+  "28865": "Anneau Cultant",
+  "40766": "Ajoute {addAir:aa} quand vous déclenchez {#BOUNCE[REBOND]}.\n\\---\n+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 5% par niveau)",
+  "24383": "Ayez confiansssse en cet anneau, croyez en lui pour qu\u0027il puisssse veiller sur vous...",
+  "77188": "Anneau Condau",
+  "48314": "{value:(padd/10)}% de chance d\u0027ajouter {addReserve:pa} quand vous déclenchez {#BOUNCE[REBOND]}.\n\\---\n(+ 0.5% par niveau)",
+  "4479": "Anneau Méhopaty",
+  "87468": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e, {value:(padd/10)}% de chances de générer un {%pa} de {%reserve}.\n\\---\n+{value:pv}% {%PV} max.\n(+ 0.5% par niveau)",
+  "9493": "Le seul fait de porter cet anneau vous donnera l\u0027impression de vous sentir mieux. Bien sûr, vos blessures ne guériront pas, mais c\u0027est un détail.",
+  "77603": "Anneau Nymousse",
+  "43645": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e, il inflige {physicalDamage:dmg} à un adversaire autour \u003csprite name\u003dcell_around\u003e de lui.\\v\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "10557": "Gardez constamment un œil sur les porteurs de cet anneau ; ils seraient bien capables de vous faire un enfant dans le dos.",
+  "75702": "Anneau Vulant",
+  "32838": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Ajoute {addReserve:r}.",
+  "11466": "Anneau Deter",
+  "69738": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: ajoute {addEarth:valueA}.",
+  "70507": "Un anneau de caractère forgé sur des terres austères par des dignitaires totalitaires aux motivations profondément délétères. Une belle affaire pour son propriétaire !",
+  "57063": "« Juste un doigt ». Voici, selon sa célèbre créatrice Dylderay, tout ce dont vous aurez besoin pour jouir pleinement des pouvoirs de ce puissant anneau.",
+  "98487": "Le parfait accessoire pour vous accompagner dans vos excursions nocturnes jusqu\u0027à la cuisine. Les fringales, ça ne se discute pas !",
+  "26258": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: ajoute {addFire:value}.",
+  "18483": "Anneau Tredam",
+  "46471": "+{value:gel}% dégâts de {#FROZEN[GEL]}.\n(+ 0.3% par niveau)\n\\---\n+{attackBoost:Att}",
+  "26394": "Anneau Hell",
+  "12386": "Cet anneau a été créé pour vous rappeler la dure réalité de la vie : un gros bonhomme qui s\u0027introduit chez vous la nuit pour vous laisser des cadeaux, ça n\u0027existe pas !",
+  "55492": "Prenez soin de cet anneau, il est la demeure d\u0027un être tourmenté par ses désirs. Vous ne voulez pas savoir lesquels.",
+  "35016": "+{value:gel}% aux dégâts de {#FROZEN[GEL]}.\n(+ 0.3% par niveau)\n\\---\n+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 0.8% par niveau)",
+  "86810": "Anneau Bsession",
+  "45949": "Cet anneau vous avertira du danger imminent. En général, il sera déjà trop tard, mais vous ne pouvez pas trop lui en demander non plus.",
+  "69138": "+{value:ppow}% aux dégâts physiques.\n(+ 0.3% par niveau)\n\\---\n+{value:loot}% au drop d\u0027objets sur les monstres.\n(+ 0.1% par niveau)",
+  "2542": "Anneau Stromo",
+  "80254": "Un troisième œil au milieu du front pourrait sembler quelque peu disgracieux. Du coup, il y a cet anneau.",
+  "42323": "Anneau Rifice",
+  "3988": "Applique {#STUN[ASSOMMÉ]} quand votre héros charge une cible avec l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e.\n\\---\n+{value:col}% aux dégâts de collision.\n(+ 0.5% par niveau)",
+  "97069": "Les porteurs de cet anneau ont tendance à se montrer désagréables lorsqu\u0027on les contredit. Vous êtes prévenu.",
+  "49167": "Anneau Pignatre",
+  "1349": "Votre héros applique {#STUN[ASSOMMÉ]} quand il attaque une cible avec l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e.",
+  "26589": "Méfiez-vous, ce petit bijou en métal précieux pourrait bien vous brûler les doigts.",
+  "95056": "Vulk\u0027Anneau",
+  "91367": "Votre héros déclenche {explosion:ex} quand il attaque une cible avec l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled/\u003e.",
+  "10259": "Léger comme l\u0027air, redoutable comme le vent, cet anneau vous donnera l\u0027impression qu\u0027une douce brise vous chatouille gentiment les doigts.",
+  "3701": "Anneau Carina",
+  "24295": "Quand votre héros attaque un adversaire \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e il inflige {value:dmg} dégâts physiques en {#BOUNCE}.",
+  "14139": "On connait bien peu de choses sur cet étrange anneau ; d\u0027aucun disent qu\u0027il serait issu de la collection personnelle d\u0027un illustre inconnu, d\u0027autres qu\u0027il était le symbole d\u0027un groupuscule de Roublards sans grande ambition. Quoiqu\u0027il en soit, ça ne vous empêche pas de le porter, mais il est déconseillé de l\u0027exhiber.",
+  "10323": "+{value:(mcc/10)}% de chance d\u0027effectuer critiques magiques.\n(+ 3% par niveau)\n\\---\n+{value:(mdcc/10)}% aux dégâts des critiques magiques.\n(+ 0.8% par niveau)",
+  "46889": "Rarement conviés aux soirées mondaines, les porteurs de l’anneau Strogote pourront toujours se consoler en brisant des os. Pas de jugement, on s’amuse comme on peut.",
+  "8485": "Anneau Strogote",
+  "52240": "+{value:dmgP}% aux dégâts physiques.\n(+ 0.3% par niveau)\n\\---\n+{value:(ccP/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 2% par niveau)",
+  "70985": "Quitte à avoir ce bijou, autant sortir un peu de chez vous.",
+  "8274": "Anneau Taku",
+  "24934": "+{value:dmgM}% aux dégâts magiques.\n(+ 0.3% par niveau)\n\\---\n+{value:(ccM/10)}% de dégâts critiques magiques.\n(+ 2% par niveau)",
+  "70732": "Malgr룵n nom des plus effrayant, la cr룴ure qui a inspir룣et anneau 뷡it la plus douce du monde des 12.\nIl faut dire que ses sept centim뷲es de hauteur ne lui offrait pas forc믥nt beaucoup d\u0019autres options. A part peut-뷲e la magie...",
+  "35217": "LE PLOUTROZORUS",
+  "85282": "\u003cb\u003eDEBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Invoque un {Summoning:36} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e ⣶votre héros.\n\\---",
+  "70364": "Les tétons pointent et vos muscles se gonflent sous votre chemise en lin... Vos bottes vous serrent soudainement au niveau des mollets et clairement vous comprenez qu\u0027il va vous falloir vider votre bourse pour quelques nouveaux slips. Toutes ces agréables sensations vous sont procurées par l\u0027anneau que vous venez d\u0027équiper, le Muscapol. Forgés dans les muscles d\u0027un chasseur redoutable, il vous est conseillé de couvrir votre nouveau corps pour éviter de faire tourner la tête de votre entourage.",
+  "5678": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Invoque un {Summoning:392} sur une case adjacente \u003csprite name\u003dcell_cross\u003e à votre héros.",
+  "37346": "Le Muscapol",
+  "63054": "Même la nuit dans son grand lit, il disait «\\_UI\\_\\_», «\\_UI\\_», «\\_UI\\_» !!! Fran’Eau n’était pas très gros et qu’un peu beau mais c’était un héros. Mieux qu’un héros, un chevalier au cœur tendre et aux membres doux, c’était Fran’Eau, le chevalier du Crystal Mou !",
+  "6620": "Le Fran\u0027eau",
+  "90902": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Invoque un {Summoning:553} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e ⣶à votre héros.",
+  "59668": "Cet anneau renferme un grand pouvoir. Pour vous, cela implique de grandes responsabilités.",
+  "99039": "Anneau Riginel",
+  "388": "20% de chances de générer 1 niveau de {#WAKFU} quand vous gagnez du Wakfu.\\v\\---\n{value:ppow}% aux dégâts physiques\n(+ 0.5% par niveau)",
+  "42320": "A l\u0027intérieur de l\u0027anneau, on peut lire : «\\_Un anneau pour les fossiliser tous, et dans la Stasis les lier\\_». Probablement un produit made in Pandala.",
+  "70710": "Anneau Xymore",
+  "612": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e :\\_20% de chances de générer 1 niveau de {#STASIS} quand aucun ennemi n’est autour \u003csprite name\u003dcell_around\u003e.\\v\\---\n+{value:mpow}% aux dégâts magiques.\n(+ 0.5% par niveau)",
+  "46064": "",
+  "68503": "",
+  "62298": "",
+  "28760": "",
+  "34358": "",
+  "63031": "",
+  "54791": "peu commun"
+}
diff --git a/data/json/dico/Fight.json b/data/json/dico/Fight.json
index 69d4a8647f02671927784c04016c3f1a7e3e4a51..5cb8f4f54330bdffbf31568c8036c8da816a05d5 100644
--- a/data/json/dico/Fight.json
+++ b/data/json/dico/Fight.json
@@ -1,5 +1,5 @@
 {
-  "605": "Fight",
+  "1036": "Fight",
   "17995": "Lancer le combat",
   "99373": "Voulez-vous vraiment abandonner le combat ?",
   "85044": "Abandonner",
@@ -389,7 +389,7 @@
   "79579": "Je crois qu\u0027ils veulent que je rejoigne leur armée\\_!",
   "49381": "Voil⣤à de quoi vous requinquer un peu.",
   "38528": "C\u0027est juste une petite bosse, demain il n\u0027y paraîtra plus\\_!",
-  "19213": "Faites attention\\và v⣶ous\\_!",
+  "19213": "Faites attention\\và vous⣶\\_!",
   "82952": "Oh, laissez-moi vous soigner...",
   "37621": "Jon, accepte mon défi et bats-toi comme un Cochon\\_!",
   "10534": "Jon, accepte mon défi et bats-toi comme un Cochon\\_!",
@@ -603,5 +603,8 @@
   "81981": "Graaaaaarrg",
   "43037": "Coin coin\\_!",
   "20866": "Coin coin\\_!",
-  "6074": "Graaaaaargh"
+  "6074": "Graaaaaargh",
+  "32589": "Graaaaaargh",
+  "94136": "Aucun objet n\u0027est à vendre dans la boutique actuellement",
+  "38049": "POL\\_!"
 }
\ No newline at end of file
diff --git a/data/json/dico/Gods.json b/data/json/dico/Gods.json
index f2a013cbe2ada94dcf45fd72a8cb9052821d050f..b2e322c495e70dfa8d3e31fb75364ec6dc814b6e 100644
--- a/data/json/dico/Gods.json
+++ b/data/json/dico/Gods.json
@@ -1,5 +1,5 @@
 {
-  "28": "Gods",
+  "1036": "Gods",
   "48379": "Cra",
   "60273": "Eniripsa",
   "50594": "Combattez auprès de vos bêtes et renforcez votre côté animal.",
@@ -7,11 +7,7 @@
   "42555": "Pandawa",
   "27026": "Osamodas",
   "55423": "",
-  "18120": "Cra",
-  "90867": "Tenez la distance et décochez vos mires\\npour décimer vos adversaires.",
   "52524": "Sacrieur",
-  "59822": "N\u0027ayez pas peur de prendre des coups\\net devenez une vraie plaie pour vos adversaires.",
-  "30105": "Sacrieur",
   "57613": "Prenez soin de vos alliés\\net surmontez ensemble tous les obstacles.",
   "32256": "N\u0027ayez pas peur de prendre des coups\\net devenez une vraie plaie pour vos adversaires.",
   "34515": "Tenez la distance et décochez vos mires\\npour décimer vos adversaires.",
@@ -26,5 +22,8 @@
   "7473": "Obtenez des actions supplémentaires\\nen contrôlant votre temps et celui de vos adversaires.",
   "89188": "Sram",
   "75439": "Disposez des pièges et poussez vos adversaires\\nvers une mort certaine.",
-  "78077": "Iop"
+  "78077": "Iop",
+  "91555": "Foncez au cœur de la mélée et cognez fort vos adversaires.",
+  "39391": "Naufragé",
+  "10059": "Vous êtes un héros en devenir."
 }
\ No newline at end of file
diff --git a/data/json/dico/Mechanisms.json b/data/json/dico/Mechanisms.json
index 1135b6c11702ff72a23924f94a2b40dd9e31464c..d6c85c63b80a0cd932c906103c8216ffa7e3efd7 100644
--- a/data/json/dico/Mechanisms.json
+++ b/data/json/dico/Mechanisms.json
@@ -1,6 +1,6 @@
 {
-  "198": "Mechanisms",
-  "81239": "{#MECHANISM}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Repousse les personnages\\v sur ses lignes de {cell:c}.",
+  "1036": "Mechanisms",
+  "81239": "{#MECHANISM}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: {#PUSH} de {cell:c} le premier personnage aligné de chaque ligne.",
   "61416": "Sinistro Air",
   "41595": "{#MECHANISM}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: {addReserve:r}.",
   "44654": "Sinistro Eau",
@@ -8,26 +8,16 @@
   "35064": "Sinistro Feu",
   "55293": "{#MECHANISM}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Confère {#SHIELD} à votre héros.",
   "80697": "Sinistro Terre",
-  "67290": "Babydruille",
-  "86044": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Inflige {mechanismDamage:dmg}\\vsur ses lignes.",
   "38775": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Inflige {magicalDamage:dmg}\\v à l\u0027adversaire ayant le plus de {%PV}.",
   "67764": "Hydruille",
   "56744": "Cadran de Xélor",
   "90241": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{blindage:bl} et donne +{armor:ar} à votre héros.",
-  "97174": "{#MECHANISM}",
-  "1916": "Sinistro Neutre",
-  "93587": "Donne +3{%PM} pour le tour à vos personnages quand un adversaire s\u0027arrête dessus.",
-  "66038": "Sol Accélérateur",
-  "48398": "{#STARTTURN}\\_: Le joueur dont le personnage est dessus pioche 1 sort.",
-  "68314": "Sol Bénit",
+  "97174": "{#MECHANISM}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Piochez votre prochain sort de \u003cb\u003eMÉCANISME\u003c/b\u003e.",
+  "1916": "Sinistro Astral",
   "13690": "{addReserve:r} quand un adversaire s\u0027arrête dessus.",
   "21633": "Sol Motivant",
   "25636": "Bombe",
   "24382": "{#MECHANISM}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: {explosion:ex}.",
-  "2815": "Sinistro Eau",
-  "87923": "{#MECHANISM}\n\u003cb\u003eDÉBUT DE TOUR\\_:\u003c/b\u003e Vous gagnez 1\\_\u003cb\u003ePA\u003c/b\u003e supplémentaire pour le tour.",
-  "25500": "Bombe",
-  "66014": "{#MECHANISM}\n\u003cb\u003eDÉBUT DE TOUR\\_:\u003c/b\u003e {explosion:ex}",
   "69881": "{#FLOOR}\n\\---\n{#ASSEMBLY}\n\\---\nInflige {magicalDamage:dmg} à l\u0027adversaire\\vqui s\u0027arrête dessus.",
   "82491": "Piège",
   "63018": "Pointe Macabre",
@@ -44,10 +34,8 @@
   "24598": "Inflige {value:min} à {magicalDamage:max} à l\u0027adversaire qui le déclenche.",
   "59329": "Ossuaire Funeste",
   "19942": "{#MECHANISM}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Invoque un {Summoning:238} sur une case adjacente \u003csprite name\u003dcell_cross\u003e à lui et perd {value:v}\\_{%bl}.",
-  "64546": "Herbe haute",
-  "84582": "",
   "77985": "Totem Purifiant",
-  "30733": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{attackBoost:at} aux alliés\\vet les soigne de {heal:hp}.",
+  "30733": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{value:at}% de dégâts physiques aux alliés\\vet les soigne de {heal:hp}.",
   "14404": "Sève toxique",
   "98451": "{#POISONED[EMPOISONNE]} de manière permanente l\u0027unité qui s\u0027arrête dessus.",
   "80555": "Catalyseur Temporel",
@@ -66,108 +54,20 @@
   "49046": "{#MECHANISM}\n\\---\n{#UNIQUE}\n\\---\n\u003cb\u003eFIN DE TOUR\u003c/b\u003e\\_: +1 AURA à un \u003cb\u003eCochon\u003c/b\u003e allié.",
   "9019": "Orbe d\u0027Inhibition",
   "67056": "{#MECHANISM}\n\\---\nLa {%reserve} ne peut pas être utilisée pour augmenter vos {%PA}.",
-  "14528": "Trou de Lave",
-  "84925": "{#MECHANISM!}\n{#APPEARANCE} ou {#STARTTURN} : Invoque jusqu\u0027à 3 {FloorMechanism:278[FLAQUES DE LAVE]} jusqu\u0027à {cell:c} de lui.\nSi la {FloorMechanism:278} est invoqué sur un personnage, elle lui inflige ses dégâts directement.",
   "32895": "Crache-Lave",
   "73527": "{#MECHANISM!}\n\\---\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Inflige {magicalDamage:dmg} aux adversaires et {magicalDamage:dmg2} aux Bworks sur ses lignes puis se détruit.",
-  "74955": "",
-  "6755": "",
-  "10544": "Lierre",
-  "33722": "{#MECHANISM}",
-  "58748": "Bonus Vie",
-  "66465": "Quand le joueur marche dessus :\n+{value:pv}\\_{%pv} à tous les alliés\nou\n+{value:ar}\\_{%ar} à tous les alliés",
-  "58828": "Bonus Attaque",
-  "90919": "Quand le joueur marche dessus :\n+{value:at}\\_{%at} à tous les alliés\nou\nInflige {magicalDamage:dmg} à tous les ennemis",
-  "44867": "Bonus Ressource",
-  "69902": "Quand le joueur marche dessus :\n+{value:r}\\_{%reserve} à tous les joueurs\nou\n+{value:j}\\_\u003csprite name\u003dneutral\u003e à tous les joueurs\nou\n+{value:pa}\\_{%pa} Permanent à tous les joueurs",
-  "19326": "",
-  "77578": "",
-  "33556": "Mini Rocher",
-  "56278": "{#CRAQUELOROC}.",
-  "342": "Rocher Moussu",
-  "84056": "{#STARTTURN!} : Inflige {magicalDamage:dmg} aux adversaires {#WET!} et confère autant d\u0027{%AR} au {Summoning:171}.",
   "12330": "Rocher",
   "61679": "{#MECHANISM}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Confère +{armor:AR}\\vaux \u003cb\u003eCRAQUELEURS\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around\u003e.\n\\---\nPerd autant de {%bl} que d\u0027 {%ar} donnée.",
-  "86683": "Stalagmite",
-  "9373": "{#CRAQUELOROC}.\n{#ENDTURN!} : Inflige {magicalDamage:dmg} aux adversaires {#AROUND!}.",
-  "21600": "Minerai",
-  "83942": "{#CRAQUELOROC}.\nConfère {value:dmgBoost}\\_{%AT} aux \u003cb\u003eCRAQUELEURS\u003c/b\u003e.\n{#DEATH!} : Peut invoquer un {Summoning:306}.",
-  "26260": "Pilier",
-  "27569": "",
   "2631": "Monolithe Occulte",
   "1143": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_:\\_+{armor:ar} à tous les alliés.",
-  "36226": "Pilier du Feu",
-  "98755": "",
-  "59351": "Pilier de l\u0027Air",
-  "58492": "",
-  "75792": "Pilier de la Terre",
-  "67656": "",
-  "38731": "Pilier de l\u0027Eau",
-  "69413": "",
-  "36538": "Minomarque",
-  "54301": "{#FLOOR}\n+5\\_{%at} au Minotauror quand un adversaire s\u0027arrête dessus.",
   "14263": "Bout de bois pourri",
   "31864": "Se détruit à la fin du tour.",
-  "29216": "Piège de Capture",
-  "82403": "{#FLOOR}\nCapture un \u003cb\u003eCHUCHOTEUR\u003c/b\u003e ou un \u003cb\u003eCOCHON\u003c/b\u003e {#ROOTED[IMMOBILISÉ]!} qui s\u0027arrête dessus.\n{#APPEARANCE!} : \u003cb\u003eELECTROCUTE\u003c/b\u003e les adversaires alignés entre ce piège et un autre.",
-  "75827": "Cage",
-  "66357": "{#MECHANISM!}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e",
-  "25400": "Fontaine",
-  "34302": "{#MECHANISM}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e\nApplique {#WET!} aux personnages qui l\u0027attaque.",
-  "95290": "Flamme",
-  "80398": "{#MECHANISM}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e\n{#STARTTURN!} : Inflige {magicalDamage:dmg} au personnage ayant le plus de {%PV}.\nEst détruit s\u0027il se fait attaquer par un personnage {#WET!}.",
-  "86820": "Appareil Électrique",
-  "28034": "{#MECHANISM}\n{#STARTTURN!} : S\u0027active.\n\u003cb\u003eACTIVATION\u003c/b\u003e : Inflige {magicalDamage:dmg} aux adversaires alignés.",
-  "38623": "Flamme",
-  "68930": "{#MECHANISM}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e\n{#STARTTURN!} : Inflige {magicalDamage:dmg} au personnage ayant le plus de {%PV}.\nEst détruit s\u0027il se fait attaquer par un personnage {#WET!}.",
-  "51755": "Toilette",
-  "13511": "{#MECHANISM}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e",
-  "20999": "Trou",
-  "62160": "{#MECHANISM}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e\n\u003cb\u003eDÉBUT DES TOURS IMPAIRS\u003c/b\u003e : Invoque des monstres des égouts et -10\\_{%BL}.",
-  "1408": "Gros Appareil Électrique",
-  "86341": "{#MECHANISM}\n{#STARTTURN!} : S\u0027active.\n\u003cb\u003eACTIVATION\u003c/b\u003e : Inflige {magicalDamage:dmg} aux personnages alignés.\nLes dégâts que devrait subire le Chuchoteur de Maison sont subis par un adversaire {#AROUND!} de lui.",
   "41859": "Cristal de Roche",
   "13342": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e : Applique {#WHISPERED} ou {#ROOTED[Immobilisé]} si la cible est {#WHISPERED[CHUCHOTÉE]} aux adversaires \u003cb\u003eAUTOUR\u003c/b\u003e.",
-  "63168": "Lancer de Shuriken géant",
-  "95792": "Quand il est déclenché, invoque un {ObjectMechanism:926} puis inflige {magicalDamage:dmg} dans la zone\u003csprite name\u003dcell_cross\u003e.\n{#ENDTURN} : se déclenche puis se détruit.",
-  "90562": "Shuriken géant",
-  "26515": "{#UNMOVABLE}\nNe peut pas être détruit.",
-  "74500": "Lancer de kunaïs",
-  "56985": "Quand il est déclenché, inflige {magicalDamage:dmg} à tous les personnages alignés.\n{#ENDTURN} : se déclenche, puis se détruit.",
-  "1273": "Parchemin explosif",
-  "84039": "Déclenche {explosion:ex} quand il est activé.\n{#ENDTURN} : se déclenche, puis se détruit.",
-  "33109": "Makibishi",
-  "40358": "Inflige {magicalDamage:dmg} et retire {value:pm}\\_{%pm} permanent au personnage qui le déclenche.",
-  "20881": "Mizugumo",
-  "13203": "Confère {value:pm}\\_{%pm} permanent au personnage qui le déclenche.",
-  "91590": "Nunchaku",
-  "50147": "Confère {value:at}\\_{%at} permanents au personnage qui le déclenche.",
-  "23429": "Flageolet enchanté",
-  "39828": "Soigne de {value:pv}\\_{%pv} le personnage qui le déclenche.",
-  "35508": "Bento",
-  "19358": "Quand un allié déclenche le piège, vous piochez {value:c}\\_sorts.",
-  "31072": "Entrainement d\u0027Endurance",
-  "6275": "Quand le Chuchoteur marche dessus :\n+{value:pv}\\_{%pv}\nou\n+{value:ar}\\_{%ar}",
-  "37145": "Entrainement de Force",
-  "9551": "Quand le Chuchoteur marche dessus :\n+{value:at}\\_{%AT}\nou\n{#RIPOSTE!}\\_({value:dmg})",
-  "99025": "Kaginawa",
-  "70161": "Tous les 3 tours, invoque un \u003cb\u003eCOCHON NINJA\u003c/b\u003e et perd {value:bl}\\_{%bl}.",
-  "20464": "Cage",
-  "77574": "{#MECHANISM!}\n\u003cb\u003eINVULNÉRABLE\u003c/b\u003e\n{#STARTTURN!} : -10\\_{%BL}.",
-  "61344": "Entrainement de Technique",
-  "49529": "Quand le Chuchoteur marche dessus :\nAjoute le sort {Spell:28415}, {Spell:28710} ou {Spell:28849}.",
-  "8466": "Pâturage",
-  "19646": "Place un Bouftou inoffensif adverse dans votre équipe.",
-  "40126": "Piège Mortel",
-  "54516": "Tue l\u0027adversaire qui le déclenche.",
-  "24822": "Forge",
-  "41966": "Retire {#PETRIFY} aux \u003cb\u003eCRAQUELEURS\u003c/b\u003e {#AROUND} d\u0027elle\\v quand elle est activée.",
   "70104": "Flaque de Lave",
   "51516": "{#FLOOR}\n\\---\nInflige {magicalDamage:dmg} au personnage qui s\u0027arrête dessus.",
   "80160": "Tombe Maudite",
   "27783": "{#MECHANISM}\n\\---\nInflige {value:min} à {magicalDamage:max} quand un adversaire termine un déplacement sur une case adjacente \u003csprite name\u003dcell_cross\u003e à elle.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e : Pose un {FloorMechanism:1203} sur sa case.",
-  "30086": "",
-  "78542": "",
   "95121": "Nuage de Souffre",
   "89594": "Inflige {magicalDamage:dmg} à l\u0027adversaire qui s\u0027arrête dessus et l\u0027{#STUN[ASSOMME]!}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Se déplace de {value:v1} ou {value:v2} cases.",
   "46350": "Tas d\u0027Os",
@@ -181,7 +81,7 @@
   "40497": "Piège à Pointes",
   "93795": "{#FLOOR}\n\\---\nApplique {fractured:PropertyEffect.42.FracturedDmg} et -1\\_{%pm} à l\u0027adversaire qui le déclenche.",
   "94749": "Geyser",
-  "45199": "{#FLOOR}\n\\---\nInflige {magicalDamage:dmg1} aux adversaires et téléporte aléatoirement le personnage qui le déclenche jusqu\u0027à 2 cases \u003csprite name\u003dcell_circle2\u003e.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Inflige {magicalDamage:dmg2} aux adversaires adjacents et repousse les personnages de 2 cases.",
+  "45199": "{#FLOOR}\n\\---\nInflige {magicalDamage:dmg1} aux adversaires et téléporte aléatoirement le personnage qui le déclenche jusqu\u0027à 2 cases \u003csprite name\u003dcell_circle2\u003e.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Inflige {magicalDamage:dmg2} aux adversaires adjacents et {#PUSH} les personnages de 2 cases.",
   "59179": "Puit des Ombres",
   "43942": "Inflige {magicalDamage:d0} au personnage qui s\u0027arrête dessus.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Attire les personnages alignés de {cell:c} et inflige {magicalDamage:d1} aux personnages autour\\_\u003csprite name\u003dcell_around\u003e.",
   "98226": "Cage",
@@ -189,12 +89,35 @@
   "178": "Bouftonciel Encagé",
   "9637": "Ce {#MECHANISM} ne peut pas détruit.\n\\---\nAu bout de \u003cb\u003e2 TOURS\u003c/b\u003e \\v\u003cb\u003eDETRUIT\u003c/b\u003e la cage",
   "44250": "Xelocube Solaire",
-  "88712": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nDéclenche un {#LIGHTNING[ÉCLAIR({value:perc})]} sur un adversaire aléatoire quand vous consommez votre réserve.",
+  "88712": "{#MECHANISM}\n\\---\n+{valueAndNext:Skill.743.dmg}% aux dégâts magiques et physiques\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nQuand vous utilisez votre {%reserve}, il inflige {valueAndNext:dmg} dégâts magiques à l\u0027adversaire ayant le plus de {%PV} par \u003cb\u003eMÉCANISME\u003c/b\u003e allié\\v(Limité à une fois par tour).",
   "29337": "Xelocube Volcanique",
-  "95114": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nVotre héros déclenche une {#EXPLOSION} d\u0027une valeur égale à {value:perc}% de son {%AT} et confère autant de {%BL} aux mécanismes alliés autour\\_\u003csprite name\u003dcell_around\u003e de lui quand vous consommez votre réserve.",
+  "95114": "{#MECHANISM}\n\\---\n+{valueAndNext:Skill.963.dmg}% aux dégâts magiques et physiques\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\n(Limité à une fois par tour).",
   "88346": "Xelocube Lunaire",
-  "11357": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nRéduit de {value:pa}\\_{%PA} le coût de vos sorts {Spell:65351[MAUSOLÂMES]}.\n\\---\nAjoute le sort {Spell:65351} à votre main quand vous consommez votre réserve.",
+  "11357": "{#MECHANISM}\n\\---\n+{valueAndNext:Skill.40.dmg}% aux dégâts magiques et physiques\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nApplique {frozen:PropertyEffect.26.FrozenDmg} à l\u0027adversaire le plus proche de votre héros, quand vous consommez votre réserve (Limité à une fois par tour).",
   "12563": "Xelocube Vide",
-  "45503": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nRéduit de {value:pa}\\_{%PA} le coût de vos sorts {Spell:38[RÉSONANCES]}.\n\\---\nAjoute le sort {Spell:38} à votre main quand vous consommez votre réserve.",
-  "5815": "Tof\u0027Argent Encagé"
+  "45503": "{#MECHANISM}\n\\---\n+{valueAndNext:Skill.226.dmg}% aux dégâts magiques et physiques\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: {addReserve:re}.\n\\---\nPiochez 1 sort quand vous consommez votre réserve (Limité à une fois par tour).",
+  "5815": "Tof\u0027Argent Encagé",
+  "11270": "Ce {#MECHANISM} ne peut pas être détruit.",
+  "27371": "Case d\u0027apparition",
+  "50842": "Une invocation va apparaître à cette position au prochain tour.",
+  "26655": "Piège Encré",
+  "98420": "Inflige {magicalDamage:dmg} à l\u0027adversaire qui le déclenche.",
+  "37045": "Piège Frigosseux",
+  "6493": "Inflige {magicalDamage:md} à l\u0027adversaire qui le déclenche et lui applique {frozen:PropertyEffect.26.FrozenDmg}.",
+  "25145": "Os Gelé",
+  "45864": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Augmente de 1 {%PA} le coût du prochain sort adverse joué ce tour.",
+  "56090": "Tas d\u0027Os",
+  "34716": "Ce {#MECHANISM} ne peut pas être détruit.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Le {Summoning:17} revient à la vie.",
+  "78314": "Tas d\u0027Os",
+  "89870": "Ce {#MECHANISM} ne peut pas être détruit.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Le {Summoning:27} revient à la vie.",
+  "55271": "Piège Explosseux",
+  "83989": "Inflige {magicalDamage:d} à l\u0027adversaire qui le déclenche.\n\\---\nIl déclenche ensuite {explosion:ex} et soigne de\\_{heal:heal} les chafers autour \u003csprite name\u003dcell_around/\u003e de lui.",
+  "17887": "Flaque d\u0027eau damnée",
+  "62156": "Inflige {value:min} à {magicalDamage:max} à \\nl\u0027adversaire qui le déclenche.",
+  "1292": "Flaque d\u0027eau damnée supérieur",
+  "63558": "Inflige {value:min} à {magicalDamage:max} à \\nl⣬\u0027adversaire qui le déclenche.\n\\---\nSoigne de {value:s}% {%PV} et confère +{value:at}% de dégâts physiques au CHAFER qui le déclenche.",
+  "98900": "Kitsu de Maître",
+  "17398": "{#MECHANISM}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Applique {#FRACTURED[FRACTURÉ]} aux adversaires \u003cb\u003eAUTOUR\u003c/b\u003e \u003csprite name\u003dcell_around\u003e et les alliés \u003cb\u003eAUTOUR\u003c/b\u003e \u003csprite name\u003dcell_around\u003e gagnent +30% de dégâts physiques pour le tour.",
+  "26451": "KATA-TRAPPE DU DOJO",
+  "94606": "Téléporte le personnage aléatoirement à 2 cases ou plus du piège et applique {#STUN[ASSOMÉ]}."
 }
\ No newline at end of file
diff --git a/data/json/dico/Packs.json b/data/json/dico/Packs.json
index bd3ae8bc97ccf01a75f77bfafd53cec5758ca66b..c8233170a565ab5af7179185963d761836615e2e 100644
--- a/data/json/dico/Packs.json
+++ b/data/json/dico/Packs.json
@@ -1,190 +1,5 @@
 {
-  "188": "Packs",
-  "44083": "Test - Pack Test",
-  "22527": "hard currency, Xp, gem : geo, champion ruel",
-  "4015": "",
-  "45169": "x5 Fragments Topaze Rares",
-  "78567": "",
-  "62366": "x2 Fragments Émeraude Légendaires",
-  "45714": "",
-  "11343": "x5 Fragments Améthyste Rares",
-  "71317": "",
-  "77378": "x10 Fragments Saphirs Rares",
-  "13768": "",
-  "32082": "x15 Fragments Émeraude Communs",
-  "10600": "",
-  "31208": "x15 Fragments Rubis Communs",
-  "17630": "",
-  "66582": "x10 Fragments Améthyste Rares",
-  "20614": "",
-  "98984": "x15 Fragments Saphirs Communs",
+  "1036": "Packs",
   "94111": "x15 Fragments Améthyste Communs\nx5 Fragments Améthyste Rares",
-  "20057": "Petit Lot d\u0027Améthystes",
-  "85341": "",
-  "2204": "x5 Fragments Émeraude Rares",
-  "8962": "",
-  "68980": "x100 Fragments Saphirs Communs",
-  "47367": "",
-  "1826": "x100 Fragments Améthyste Communs",
-  "81372": "",
-  "12668": "x5 Fragments Saphirs Rares",
-  "96571": "",
-  "5809": "x100 Fragments Topaze Communs",
-  "71544": "",
-  "94905": "x10 Fragments Rubis Rares",
-  "3821": "",
-  "40550": "x10 Fragments Émeraude Rares",
-  "55642": "",
-  "65480": "x100 Fragments Rubis Communs",
-  "6320": "",
-  "19703": "x40 Fragments Émeraude Communs",
-  "87459": "",
-  "55282": "x2 Fragments Saphirs Légendaires",
-  "40911": "",
-  "65172": "x40 Fragments Topaze Communs",
-  "57683": "",
-  "50700": "x40 Fragments Améthyste Communs",
-  "47771": "",
-  "93011": "x10 Fragments Topaze Rares",
-  "53875": "",
-  "27316": "x15 Fragments Topaze Communs",
-  "244": "",
-  "78579": "x2 Fragments Améthyste Légendaires",
-  "95457": "",
-  "19631": "x1600 Kamas",
-  "49560": "",
-  "18338": "x2 Fragments Topaze Légendaires",
-  "96822": "",
-  "63860": "x40 Fragments Saphirs Communs",
-  "3009": "",
-  "44189": "x5 Fragments Rubis Rares",
-  "68291": "",
-  "2051": "",
-  "16019": "",
-  "10644": "x2 Fragments Rubis Légendaires",
-  "1758": "",
-  "14138": "x40 Fragments Rubis Communs",
-  "6761": "",
-  "58565": "x100 Fragments Émeraude Communs",
-  "65688": "x100 Kamas",
-  "84691": "",
-  "94490": "x200 Kamas",
-  "39634": "",
-  "35293": "x300 Kamas",
-  "56393": "",
-  "97415": "x400 Kamas",
-  "68587": "",
-  "57913": "x500 Kamas",
-  "99151": "",
-  "66619": "x600 Kamas",
-  "27879": "",
-  "28007": "x700 Kamas",
-  "73647": "",
-  "47191": "x800 Kamas",
-  "14405": "",
-  "9058": "x900 Kamas",
-  "23482": "",
-  "47638": "x1000 Kamas",
-  "76288": "",
-  "51378": "x1100 Kamas",
-  "81127": "",
-  "61929": "x1200 Kamas",
-  "48785": "",
-  "6703": "x1300 Kamas",
-  "2903": "",
-  "42721": "x1400 Kamas",
-  "55420": "",
-  "55258": "x1500 Kamas",
-  "24080": "",
-  "86480": "x1700 Kamas",
-  "59786": "",
-  "27016": "x1800 Kamas",
-  "68279": "",
-  "98280": "x1900 Kamas",
-  "43945": "",
-  "2443": "x2000 Kamas",
-  "22809": "",
-  "98783": "x2100 Kamas",
-  "56933": "",
-  "10435": "x2200 Kamas",
-  "56406": "",
-  "44301": "x2300 Kamas",
-  "2700": "",
-  "73732": "x2400 Kamas",
-  "48222": "",
-  "32339": "x120 Kamas",
-  "36057": "",
-  "67246": "x140 Kamas",
-  "44103": "",
-  "86234": "x160 Kamas",
-  "96189": "",
-  "97527": "x180 Kamas",
-  "44671": "",
-  "2941": "x220 Kamas",
-  "94140": "",
-  "60137": "x240 Kamas",
-  "79685": "",
-  "50908": "x260 Kamas",
-  "23208": "",
-  "72070": "x280 Kamas",
-  "14575": "",
-  "43165": "x320 Kamas",
-  "9602": "",
-  "62809": "x340 Kamas",
-  "60766": "",
-  "64783": "x360 Kamas",
-  "74257": "",
-  "41291": "x380 Kamas",
-  "93861": "",
-  "59548": "x420 Kamas",
-  "71442": "",
-  "89653": "x440 Kamas",
-  "72671": "",
-  "46636": "x460 Kamas",
-  "66876": "",
-  "69711": "x480 Kamas",
-  "80971": "",
-  "93139": "x500 Kamas",
-  "32992": "",
-  "61969": "x520 Kamas",
-  "65809": "",
-  "97397": "x540 Kamas",
-  "57919": "",
-  "7187": "x560 Kamas",
-  "66550": "",
-  "42369": "x580 Kamas",
-  "39876": "",
-  "66831": "x600 Kamas",
-  "28823": "",
-  "5614": "x620 Kamas",
-  "53224": "",
-  "49445": "x640 Kamas",
-  "88232": "",
-  "39826": "x660 Kamas",
-  "32056": "",
-  "58795": "x680 Kamas",
-  "54124": "",
-  "86856": "x700 Kamas",
-  "24420": "",
-  "79344": "x2500 Kamas",
-  "36092": "",
-  "71482": "x2600 Kamas",
-  "66036": "",
-  "84845": "x2700 Kamas",
-  "70290": "",
-  "8299": "x2800 Kamas",
-  "53656": "",
-  "55891": "x2900 Kamas",
-  "45902": "",
-  "97776": "x3000 Kamas",
-  "26646": "",
-  "15251": "x3100 Kamas",
-  "41967": "",
-  "25519": "x3200 Kamas",
-  "34937": "",
-  "2979": "x3300 Kamas",
-  "71585": "",
-  "5011": "x3400 Kamas",
-  "15986": "",
-  "35815": "x3500 Kamas"
+  "20057": "Petit Lot d\u0027Améthystes"
 }
\ No newline at end of file
diff --git a/data/json/dico/Quest.json b/data/json/dico/Quest.json
index b02fe880bed915583e8df8547a6f7a45aa86ddc1..5a7e715f184f1a18283b36d422bd3bde65083f04 100644
--- a/data/json/dico/Quest.json
+++ b/data/json/dico/Quest.json
@@ -1,5 +1,13 @@
 {
-  "3": "Quest",
+  "1036": "Quest",
   "77121": "Ce chapitre est indisponible car un membre du groupe n\u0027a pas fini les chapitres précédent.",
-  "25603": "Quête {0}"
+  "25603": "Quête {0}",
+  "85628": "Nouveautés colporteur",
+  "69500": "",
+  "93521": "",
+  "26399": "",
+  "72229": "",
+  "3298": "",
+  "39880": "",
+  "39114": ""
 }
\ No newline at end of file
diff --git a/data/json/dico/Resources.json b/data/json/dico/Resources.json
index 962332f02201a8b3338bbec5823c16408884f9de..a4f0c068b9a96fcf444b6373001a018daf7a2612 100644
--- a/data/json/dico/Resources.json
+++ b/data/json/dico/Resources.json
@@ -1,5 +1,5 @@
 {
-  "32": "",
+  "1036": "Resources",
   "86930": "rune de test",
   "25041": "",
   "39832": "Fragment Améthyste Commun",
@@ -30,5 +30,14 @@
   "82562": "Utilisé pour améliorer vos compagnons.",
   "10572": "Fragment Émeraude Commun",
   "86827": "Utilisé pour améliorer vos compagnons.",
-  "56880": "Fragment Saphir Commun"
+  "56880": "Fragment Saphir Commun",
+  "68703": "Utilisé pour améliorer vos compagnons.",
+  "64235": "Astre Alpha",
+  "16942": "Utilisé pour améliorer vos anneaux.",
+  "61745": "Astre Oméga",
+  "28203": "Utilisé pour améliorer vos anneaux.",
+  "24603": "WAKFU",
+  "45627": "Votre niveau de Wakfu vous permet de lancer des sorts bien plus puissant que la moyenne.",
+  "90157": "STASIS",
+  "95231": "Votre niveau de Stasis vous permet de lancer des sorts bien plus puissant que la moyenne."
 }
\ No newline at end of file
diff --git a/data/json/dico/Skills.json b/data/json/dico/Skills.json
index 065ea8fa37c0c6047b89bd20556ea6b6f59f6a0e..d2ed284c4f78d8e10d7eebd0fa68dd4a04c15be9 100644
--- a/data/json/dico/Skills.json
+++ b/data/json/dico/Skills.json
@@ -1,114 +1,114 @@
 {
-  "1191": "Skills",
-  "45475": "HP I",
+  "1036": "Skills",
+  "45475": "",
   "34236": "Rémanence Ardente",
-  "14616": "Quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance d\u0027appliquer \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.",
+  "14616": "Quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e sur un adversaire\\_: {valueAndNext:(perc/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e s\u0027il ne l\u0027a pas.\n(1 fois par tour).",
   "79407": "Bretteur du Désert",
-  "27627": "Quand votre héros libère une\\_AURA {#FIRESWORD}\\_: il a {valueAndNext:(perc/10)}% de chance d\u0027en gagner {value:aura}.",
+  "27627": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Votre héros gagne +{valueAndNext:dmgP}% aux dégâts physiques jusqu\u0027à sa prochaine attaque s\u0027il possède une \u003cb\u003eAURA ÉPÉE\u003c/b\u003e.",
   "93390": "Aiguisage Brûlant",
-  "86168": "Quand un compagnon ou une invocation alliée attaque\\_: votre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:percAt}% d\u0027{%AT} pour le tour .",
+  "86168": "Quand vous jouez un sort\\_: inflige {physicalDamageAndNext:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.\n(1 fois par tour)",
   "19561": "Posture du Feu",
-  "75621": "Quand vous appliquez \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance de réduire de {value:pa}\\_{%PA} le coût du prochain sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e joué.",
+  "75621": "Quand votre héros attaque un adversaire ayant l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e\\_: inflige {physicalDamageAndNext:dmg} aux adversaires sur les {cell:c} devant lui.",
   "89802": "Déferlement du Volcan",
-  "53543": "Quand votre héros libère une AURA \u003cb\u003eÉPÉE\u003c/b\u003e\\_: il a {valueAndNext:(perc/10)}% de chance d\u0027attaquer à nouveau sa cible.",
+  "53543": "Quand vous jouez au moins {value:s}\\_sorts dans le tour\\_: votre héros gagne +{valueAndNext:at}%\\_aux dégâts physiques pour le tour.",
   "3799": "Bagarreur Agressif",
-  "88366": "Quand un compagnon ou une invocation alliée attaque\\_: votre héros a {valueAndNext:(perc/10)}% de chance de déclencher une {#EXPLOSION} d\u0027une valeur égale à {value:percAt}% de son {%AT}.",
+  "88366": "Quand une invocation ou un compagnon allié attaque\\_: votre héros déclenche {explosionAndNext:ex}.\n(1 fois par tour)",
   "87454": "Champion du Coeur",
   "83379": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:662} à votre main.",
   "81065": "Charge Fumante",
-  "30289": "Quand votre héros charge, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nGagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:ar}% de son {%AT} par case parcourue.",
-  "53982": "Traînée Explosif",
-  "64557": "Quand votre héros attaque, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant lui.",
+  "30289": "Quand votre héros charge\\_: un {#METEOR} inflige {physicalDamageAndNext:dmg} sur la cible.",
+  "53982": "Traînée Explosive",
+  "64557": "Quand votre héros charge\\_: il gagne {armorAndNext:ar} par case parcourue.",
   "14465": "Posture de la Terre",
-  "81830": "Quand vous appliquez \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance de réduire de {value:pa}\\_{%PA} le coût du prochain sort \u003cb\u003eTERRE\u003c/b\u003e\u003csprite name\u003dearth\u003e joué.",
+  "81830": "Quand votre héros attaque un adversaire ayant l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e\\_: inflige {physicalDamageAndNext:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "30570": "Rémanence Tellurique",
-  "52344": "Quand vous jouez un sort \u003cb\u003eTERRE\u003c/b\u003e\u003csprite name\u003dearth\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance d\u0027appliquer \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e.",
+  "52344": "Quand vous jouez un sort \u003cb\u003eTERRE\u003c/b\u003e\u003csprite name\u003dearth\u003e sur un adversaire\\_: {valueAndNext:(perc/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e s\u0027il ne l\u0027a pas.\n(1 fois par tour).",
   "79170": "Bretteur des Landes",
-  "43259": "Quand votre héros libère une\\_AURA {#STONESWORD}\\_: il a {valueAndNext:(perc/10)}% de chance d\u0027en gagner {value:aura}.",
+  "43259": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_\u003cb\u003eAURA ÉPÉE\u003c/b\u003e, il gagne +{armorAndNext:ar}.",
   "82071": "Aiguisage Argileux",
-  "63530": "Quand votre héros subit une attaque adverse\\_:\nil a {valueAndNext:(perc/10)}% de chance de gagner {value:percAt}% d\u0027{%AT} pour le tour.",
+  "63530": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: votre héros gagne +{armor:ar} s\u0027il a un adversaire autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "41748": "Déferlement de la Montagne",
-  "24604": "Quand vous jouez un sort de \u003cb\u003eGRIMOIRE\u003c/b\u003e\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner de l\u0027{%AR} d\u0027une valeur égale à {value:percPv}% de ses {%PV}\u003cb\u003eMAX\u003c/B\u003e.",
+  "24604": "Quand vous jouez un sort sur un adversaire adjacent\u003csprite name\u003dcell_cross\u003e à votre héros\\_: inflige {magicalDamageAndNext:dmg}.",
   "80078": "Bagarreur Prudent",
-  "17187": "Quand votre héros subit une attaque adverse\\_:\nil a {valueAndNext:(perc/10)}% de chance de gagner {#SHIELD} .",
+  "17187": "Quand votre héros subit une attaque au corps-à-corps, il gagne +{valueAndNext:boost}% aux dégâts physiques pour le tour.",
   "11706": "Posture de l\u0027Air",
-  "79069": "Quand vous appliquez \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance de réduire de {value:pa}\\_{%PA} le coût du prochain sort \u003cb\u003eAIR\u003c/b\u003e\u003csprite name\u003dwind\u003e joué.",
+  "79069": "Quand votre héros attaque un adversaire ayant l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e\\_: inflige {physicalDamageAndNext:dmg} en {#BOUNCE}.",
   "61161": "Bagarreur Réfléchi",
-  "47113": "DÉBUT DU TOUR\\_: {valueAndNext:(perc/10)}% de chance de piocher votre prochain sort MÊLÉE.",
+  "47113": "Quand votre héros charge ou se téléporte\\_: il gagne +{valueAndNext:dmgP}% aux dégâts physiques pour le tour par adversaire adjacent\\_\u003csprite name\u003dcell_cross\u003e à sa case d\u0027arrivée.",
   "81540": "Aiguisage Aérien",
-  "43812": "Quand votre héros se téléporte ou charge d\u0027au moins {cell:c}\\_: il a {valueAndNext:(perc/10)}% de chance de gagner {value:percAt}% d\u0027{%AT} pour le tour.",
+  "43812": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{valueAndNext:dmgM}% aux dégâts magiques pour le tour par adversaire autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.",
   "85840": "Bretteur du Ciel",
-  "10303": "Quand votre héros libère une\\_AURA {#WINDSWORD}\\_: il a {valueAndNext:(perc/10)}% de chance d\u0027en gagner {value:aura}.",
+  "10303": "Quand votre héros gagne une \u003cb\u003eAURA ÉPÉE\u003c/b\u003e\\_: {valueAndNext:(perc/10)}% de chance d\u0027en gagner une supplémentaire.\n(1 fois par tour)",
   "47727": "Déferlement de l\u0027Ouragan",
-  "67669": "Quand un sort de \u003cb\u003eGRIMOIRE\u003c/b\u003e est ajouté à votre main\\_: il a {valueAndNext:(perc/10)}% de chance de coûter 0\\_{%PA}.",
+  "67669": "Quand votre héros charge ou se téléporte\\_: il inflige {magicalDamageAndNext:dmg} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à sa case d\u0027arrivée.",
   "57304": "Rémanence Venteuse",
-  "17966": "Quand vous jouez un sort \u003cb\u003eAIR\u003c/b\u003e\u003csprite name\u003dwind\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance d\u0027appliquer \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
+  "17966": "Quand vous jouez un sort \u003cb\u003eAIR\u003c/b\u003e\u003csprite name\u003dwind\u003e sur un adversaire\\_: {valueAndNext:(perc/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e s\u0027il ne l\u0027a pas.\n(1 fois par tour).",
   "66932": "Posture de l\u0027Eau",
-  "73951": "Quand vous appliquez \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance de réduire de {value:pa}\\_{%PA} le coût du prochain sort \u003cb\u003eEAU\u003c/b\u003e\u003csprite name\u003dwater\u003e joué.",
+  "73951": "Quand votre héros attaque un adversaire ayant l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e\\_: inflige {physicalDamageAndNext:dmg} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e et se soigne d\u0027autant.",
   "67795": "Déferlement du Torrent",
-  "77623": "Quand votre héros gagne une AURA\\_:\nil a {valueAndNext:(perc/10)}% de chance de se soigner de {value:percPv}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e .",
+  "77623": "Quand vous jouez un sort coûtant au moins 6 {%PA} sur un adversaire\\_: inflige {magicalDamageAndNext:dmg} à la cible.",
   "1786": "Bretteur des Mers",
-  "57355": "Quand votre héros libère une\\_AURA {#ICESWORD}\\_: il a {valueAndNext:(perc/10)}% de chance d\u0027en gagner {value:aura}.",
+  "57355": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e, il se soigne de {healAndNext:pv}.",
   "8929": "Rémanence Aqueuse",
-  "32265": "Quand vous jouez un sort \u003cb\u003eEAU\u003c/b\u003e\u003csprite name\u003dwater\u003e sur un adversaire\\_: vous avez {valueAndNext:(perc/10)}% de chance d\u0027appliquer \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
+  "32265": "Quand vous jouez un sort \u003cb\u003eEAU\u003c/b\u003e\u003csprite name\u003dwater\u003e sur un adversaire\\_: {valueAndNext:(perc/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e s\u0027il ne l\u0027a pas.\n(1 fois par tour).",
   "82997": "Bagarreur Concentré",
-  "40457": "Quand votre héros se téléporte ou charge sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un adversaire\\_:\nil a {valueAndNext:(perc/10)}% de chance d\u0027ajouter +{value:r}\\_{%PA} à votre {%reserve}.",
+  "40457": "Quand votre héros attaque une cible {#FROZEN[GELÉE]}\\_: inflige {physicalDamageAndNext:dmg} à la cible.",
   "13297": "Aiguisage Humide",
-  "84010": "Quand vous utilisez votre {%reserve}\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:percAt}% d\u0027{%AT} pour le tour.",
+  "84010": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Votre héros se soigne de {healAndNext:heal} s\u0027il a un adversaire autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "56907": "Champion de la Lune",
   "16132": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:913} à votre main.",
   "88611": "Traînée Sombre",
-  "99898": "Quand votre héros attaque, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant lui.",
+  "99898": "Quand votre héros charge\\_: il se soigne de {healAndNext:pv} par case parcourue.",
   "89321": "Charge Ténébreuse",
-  "51225": "Quand votre héros charge, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nAjoute le sort {Spell:65351} à votre main s\u0027il parcourt au moins {cell:c}.",
+  "51225": "Quand votre héros charge\\_: une {#SHADOW} inflige {magicalDamageAndNext:perc} sur la cible.",
   "79145": "Charge Radieuse",
-  "35220": "Quand votre héros charge, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT}.",
+  "35220": "Quand votre héros charge\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:perc} sur la cible.",
   "80085": "Champion du Jour",
   "74938": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:368} à votre main.",
   "79360": "Traînée Lumineuse",
-  "45257": "Quand votre héros attaque, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant lui.",
+  "45257": "Quand votre héros charge\\_: il gagne +{valueAndNext:at}% aux dégâts physiques par case parcourue pour le tour.",
   "22904": "Champion de l\u0027Onde",
   "79661": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:116} à votre main.",
   "8663": "Traînée Instable",
-  "12177": "Quand votre héros attaque, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant votre héros.",
+  "12177": "Quand votre héros charge\\_: vous gagnez {valueAndNext:dmg}%\\_aux dégâts magiques par case parcourue jusqu\u0027au prochain sort joué.",
   "36219": "Charge Rémanente",
-  "44590": "Quand votre héros charge, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nAjoute le sort {Spell:38} à votre main s\u0027il parcourt au moins {cell:c}.",
+  "44590": "Quand votre héros charge\\_: une {#WAVE} inflige {magicalDamageAndNext:perc} sur la cible.",
   "16234": "Sanction Sadique",
-  "24478": "Quand votre héros gagne des AURAS \u003cb\u003eÉPÉE\u003c/b\u003e, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "24478": "Quand votre héros libère une \u003cb\u003eAURA ÉPÉE\u003c/b\u003e\\_: une {#SHADOW} inflige {magicalDamageAndNext:perc} à la cible.",
   "45407": "Estocade Sournoise",
-  "86462": "Quand votre héros attaque, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Gagne {#SHIELD}.",
+  "86462": "Quand votre héros attaque en ayant {#SHIELD}\\_: une {#SHADOW} inflige {magicalDamageAndNext:dmg} sur la cible.",
   "12534": "Bond Malfaisant",
-  "76277": "Quand votre héros attaque, il se téléporte derrière sa cible et une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT}.",
+  "76277": "Quand votre héros se téléporte\\_: il se soigne de {healAndNext:pv} par case parcourue.",
   "25192": "Appel de la Nuit",
-  "91220": "Quand vous invoquez une \u003cb\u003eÂME\u003c/b\u003e, une {#SHADOW} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros à un adversaire aléatoire.",
+  "91220": "Quand vous êtes {#PHASE[DÉPHASÉ]}\\_: une {#SHADOW} inflige {magicalDamageAndNext:dmg} sur le premier personnage que vous traversez, si c\u0027est un adversaire.",
   "64344": "Sanction Répétée",
-  "64960": "Quand votre héros gagne des AURAS \u003cb\u003eÉPÉE\u003c/b\u003e, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.",
+  "64960": "Quand votre héros libère une \u003cb\u003eAURA ÉPÉE\u003c/b\u003e\\_: une {#WAVE} inflige {magicalDamageAndNext:perc} à la cible.",
   "95439": "Estocade Muette",
-  "44579": "Quand votre héros attaque, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Gagne {#SHIELD}.",
+  "44579": "Quand votre héros attaque en ayant {#SHIELD}\\_: une {#WAVE} inflige {magicalDamageAndNext:dmg} sur la cible.",
   "44570": "Bond Silencieux",
-  "2502": "Quand votre héros attaque, il se téléporte derrière sa cible et une {#WAVE} inflige {valueAndNext:perc}% de son {%AT}.",
+  "2502": "Quand votre héros se téléporte\\_: vous gagnez {valueAndNext:dmg}% aux dégâts magiques par case parcourue jusqu\u0027au prochain sort joué.",
   "98746": "Appel du Vide",
-  "81112": "Quand vous invoquez une \u003cb\u003eÂME\u003c/b\u003e, une {#WAVE} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires qui lui sont adjacents \u003csprite name\u003dcell_cross\u003e.",
+  "81112": "Quand vous êtes {#PHASE[DÉPHASÉ]}\\_: une {#WAVE} inflige {magicalDamageAndNext:dmg} sur le premier personnage que vous traversez, si c\u0027est un adversaire.",
   "91754": "Noble Sanction",
-  "5429": "Quand votre héros gagne des AURAS \u003cb\u003eÉPÉE\u003c/b\u003e, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "5429": "Quand votre héros libère une \u003cb\u003eAURA ÉPÉE\u003c/b\u003e\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:perc} à la cible.",
   "78249": "Estocade Électrique",
-  "78694": "Quand votre héros attaque, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Gagne {#SHIELD}.",
+  "78694": "Quand votre héros attaque en ayant {#SHIELD}\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:dmg} sur la cible.",
   "97350": "Bond Éclair",
-  "54506": "Quand votre héros attaque, il se téléporte derrière sa cible et un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT}.",
+  "54506": "Quand votre héros se téléporte\\_: il gagne +{valueAndNext:at}% aux dégâts physiques par case parcourue pour le tour.",
   "39329": "Appel de l\u0027Orage",
-  "22479": "Quand vous invoquez une \u003cb\u003eÂME\u003c/b\u003e, un {#LIGHTNING} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle.",
+  "22479": "Quand vous êtes {#PHASE[DÉPHASÉ]}\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:dmg} sur le premier personnage que vous traversez, si c\u0027est un adversaire.",
   "77907": "Sanction Brûlante",
-  "18815": "Quand votre héros gagne des AURAS \u003cb\u003eÉPÉE\u003c/b\u003e, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "18815": "Quand votre héros libère une \u003cb\u003eAURA ÉPÉE\u003c/b\u003e\\_: un {#METEOR} inflige {physicalDamageAndNext:perc} sur la cible.",
   "49309": "Estocade Profonde",
-  "23624": "Quand votre héros attaque, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Gagne {#SHIELD}.",
+  "23624": "Quand votre héros attaque en ayant {#SHIELD}\\_: un {#meteor} inflige {physicalDamageAndNext:dmg} physiques sur la cible.",
   "71923": "Bond Ardent",
-  "87382": "Quand votre héros attaque, il se téléporte derrière sa cible et un {#METEOR} inflige {valueAndNext:perc}% de son {%AT}.",
+  "87382": "Quand votre héros se téléporte\\_: il gagne {armorAndNext:ar} par case parcourue.",
   "6101": "Appel du Volcan",
-  "8266": "Quand vous invoquez une \u003cb\u003eÂME\u003c/b\u003e, votre héros et cette \u003cb\u003eÂME\u003c/b\u003e gagnent de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:perc}% de l\u0027{%AT} de votre héros.",
+  "8266": "Quand vous êtes {#PHASE[DÉPHASÉ]}\\_: un {#METEOR} inflige {physicalDamageAndNext:dmg} sur le premier personnage que vous traversez, si c\u0027est un adversaire.",
   "21445": "Assimilation de l\u0027Ombre",
-  "27565": "Quand vous utilisez votre {%reserve}, une {#SHADOW} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros à un adversaire aléatoire.\n\\---\nAjoute le sort {Spell:65351} à votre main si vous consommez au moins {value:pa}\\_{%PA} de votre {%reserve}.",
+  "27565": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:73656} à votre main.",
   "2044": "Mires Spectrales",
-  "22846": "Transforme vos MIRES en {#SHADOWSIGHT[MIRES SPECTRALES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos MIRES.",
+  "22846": "Transforme vos {#SIGHT[MIRES]} en {#SHADOWSIGHT[MIRES SPECTRALES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos {#SIGHT[MIRES]}.",
   "1635": "God Dark 1 (611)",
   "33771": "God dark skill",
   "7581": "God Dark (798)",
@@ -118,7 +118,7 @@
   "84049": "God Dark (255)",
   "73836": "God dark skill",
   "96658": "Recharge Sombre",
-  "75615": "Quand vous jouez un sort ajoutant des {%PA} à votre {%reserve}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nAjoute le sort {Spell:65351} à votre main si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "75615": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si aucun adversaire n’est autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, il se soigne de {healAndNext:pv}.",
   "38335": "Specific Dark 2 (105)",
   "80151": "Weapon specific dark skill",
   "59743": "Specific Dark 2 (125)",
@@ -128,9 +128,9 @@
   "34557": "Specific Dark 2 (70)",
   "45226": "Weapon specific dark skill",
   "37726": "Téléportation Ténébreuse",
-  "76116": "Quand votre héros se téléporte, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés jusqu\u0027à 2 cases de sa case d\u0027arrivée.\n\\---\nAjoute ensuite le sort {Spell:65351} dans votre main.",
+  "76116": "Quand votre héros se téléporte\\_: il se soigne de {healAndNext:pv} par adversaire adjacent\\_\u003csprite name\u003dcell_cross/\u003e à sa case d\u0027arrivée.",
   "99776": "Mires Cosmiques",
-  "56083": "Transforme vos MIRES en {#WAVESIGHT[MIRES COSMIQUES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos MIRES.",
+  "56083": "Transforme vos {#SIGHT[MIRES]} en {#WAVESIGHT[MIRES COSMIQUES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos {#SIGHT[MIRES]}.",
   "74403": "God Empty (482)",
   "70502": "God empty skill",
   "93394": "God Empty (253)",
@@ -140,9 +140,9 @@
   "96867": "God Empty (591)",
   "3050": "God empty skill",
   "10124": "Assimilation de l\u0027Onde",
-  "26858": "Quand vous utilisez votre {%reserve}, une {#WAVE} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.\n\\---\nAjoute le sort {Spell:38} à votre main si vous consommez au moins {value:pa}\\_{%PA} de {%reserve}.",
+  "26858": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:892} à votre main.",
   "80523": "Recharge Éthérée",
-  "21415": "Quand vous jouez un sort ajoutant des {%PA} à votre {%reserve}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nAjoute le sort {Spell:38} à votre main si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "21415": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si aucun adversaire n’est autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "53269": "Specific Empty 2 (379)",
   "76423": "Weapon specific empty skill",
   "4748": "Specific Empty 2 (172)",
@@ -152,9 +152,9 @@
   "27908": "Specific Empty 2 (58)",
   "56959": "Weapon specific empty skill",
   "6282": "Téléportation Furtive",
-  "68686": "Quand votre héros se téléporte, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés jusqu\u0027à 2 cases de sa case d\u0027arrivée.\n\\---\nAjoute ensuite le sort {Spell:38} à votre main.",
+  "68686": "Quand votre héros se téléporte\\_: vous gagnez +{valueAndNext:buffM}% aux dégâts magiques par adversaire adjacent\\_\u003csprite name\u003dcell_cross/\u003e à sa case d\u0027arrivée jusqu\u0027au prochain sort que vous jouez.",
   "56719": "Mires Foudroyantes",
-  "37858": "Transforme vos MIRES en {#LIGHTNINGSIGHT[MIRES FOUDROYANTES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos MIRES.",
+  "37858": "Transforme vos {#SIGHT[MIRES]} en {#LIGHTNINGSIGHT[MIRES FOUDROYANTES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos {#SIGHT[MIRES]}.",
   "93430": "God Light (385)",
   "51528": "God light skill",
   "80740": "God Light (912)",
@@ -164,9 +164,9 @@
   "8081": "God Light (225)",
   "78620": "God light skill",
   "97780": "Assimiliation de l\u0027Éclair",
-  "88160": "Quand vous utilisez votre {%reserve}, un {#LIGHTNING} inflige {valueAndNext:perc}% l\u0027{%AT} de votre héros aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "88160": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:73558} à votre main.",
   "34512": "Recharge Lumineuse",
-  "75586": "Quand vous jouez un sort ajoutant des {%PA} à votre {%reserve}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.",
+  "75586": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si aucun adversaire n’est autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, il gagne +{valueAndNext:at}% aux dégâts physiques jusqu\u0027à sa prochaine attaque.",
   "9517": "Specific Light 2 (877)",
   "33258": "Weapon specific light skill",
   "17346": "Specific Light 2 (519)",
@@ -175,10 +175,10 @@
   "55359": "Weapon specific light skill",
   "71470": "Specific Light 2 (697)",
   "22424": "Weapon specific light skill",
-  "8889": "Téléportation Foudroyante",
-  "40022": "Quand votre héros se téléporte, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés jusqu\u0027à 2 cases de sa case d\u0027arrivée.",
+  "8889": "Téléportation Lumineuse",
+  "40022": "Quand votre héros se téléporte\\_: il gagne +{valueAndNext:buffP}% aux dégâts physiques par adversaire adjacent\\_\u003csprite name\u003dcell_cross/\u003e à sa case d\u0027arrivée pour le tour.",
   "69740": "Mires Détonantes",
-  "67621": "Transforme vos MIRES en {#METEORSIGHT[MIRES DÉTONANTES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos MIRES.",
+  "67621": "Transforme vos {#SIGHT[MIRES]} en {#METEORSIGHT[MIRES DÉTONANTES]}.\n\\---\n+{valueAndNext:perc}% aux dégâts de vos {#SIGHT[MIRES]}.",
   "78120": "God Magma (868)",
   "16786": "God magma skill",
   "79011": "God Magma (26)",
@@ -188,9 +188,9 @@
   "22268": "God Magma (968)",
   "94231": "God magma skill",
   "84189": "Assimilation du Météore",
-  "83694": "Quand vous utilisez votre {%reserve}, un {#METEOR} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.\n\\---\nVotre héros gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:(perc2/10)}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e si vous consommez au moins {value:pa}\\_{%PA} de votre {%reserve}.",
+  "83694": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: Ajoute le sort {Spell:74167} à votre main.",
   "94992": "Recharge Grondante",
-  "80530": "Quand vous jouez un sort ajoutant des {%PA} à votre {%reserve}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nVotre héros gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:(perc2/10)}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "80530": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si aucun adversaire n’est autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, il gagne {armorAndNext:ar}.",
   "38150": "Specific Magma 2 (530)",
   "121": "Weapon specific magma skill",
   "48100": "Specific Magma 2 (609)",
@@ -200,47 +200,47 @@
   "82212": "Specific Magma 2 (924)",
   "95057": "Weapon specific magma skill",
   "83346": "Téléportation Grondante",
-  "21254": "Quand votre héros se téléporte, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} sur les adversaires alignés jusqu\u0027à 2 cases de sa case d\u0027arrivée.",
+  "21254": "Quand votre héros se téléporte\\_ il gagne {armorAndNext:ar} par adversaire adjacent\\_\u003csprite name\u003dcell_cross/\u003e à sa case d\u0027arrivée.",
   "39012": "Couverture Sournoise",
-  "50671": "Quand votre héros gagne une MIRE, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e aux alliés.",
+  "50671": "Quand vous jouez un sort coûtant au moins {value:pa}\\_{%PA} sur un adversaire\\_: une {#shadow} inflige {magicalDamageAndNext:dmg} à la cible.",
   "62718": "Couverture Silencieuse",
-  "36781": "Quand votre héros gagne une MIRE, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e aux alliés.",
+  "36781": "Quand vous jouez un sort coûtant au moins {value:pa}\\_{%PA} sur un adversaire, une {#wave} inflige {magicalDamageAndNext:dmg} à la cible.",
   "28238": "Couverture Éblouissante",
-  "61027": "Quand votre héros gagne une MIRE, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e aux alliés.",
+  "61027": "Quand vous jouez un sort coûtant au moins {value:pa}\\_{%PA} sur un adversaire, un {#lightning} inflige {physicalDamageAndNext:dmg} à la cible.",
   "155": "Couverture Solide",
-  "9115": "Quand votre héros gagne une MIRE, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à un allié.",
+  "9115": "Quand vous jouez un sort coûtant au moins {value:pa}\\_{%PA} sur un adversaire, un {#meteor} inflige {physicalDamageAndNext:dmg} à la cible.",
   "83735": "Bombardement Lunaire",
-  "17231": "Quand votre héros gagne une MIRE, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires à plus de 3 cases.",
+  "17231": "Quand votre héros gagne une {#SIGHT}\\_: une {#SHADOW} inflige {magicalDamageAndNext:perc} à l\u0027adversaire le plus proche.",
   "92667": "Ciblage Malfaisant",
-  "73594": "Quand votre héros gagne une MIRE, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le plus de {%PV}.",
+  "73594": "Quand vous lancez {value:s}\\_sorts dans le tour\\_: une {#shadow} inflige {magicalDamageAndNext:dmg} à l’adversaire ayant le plus de {%PV}.",
   "5691": "Acharnement Sadique",
-  "54358": "Quand votre héros gagne une MIRE, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le moins de {%PV}.",
+  "54358": "Quand vous jouez un sort avec un coût en {%PA} réduit sur un adversaire, une {#SHADOW} inflige {magicalDamageAndNext:perc} à la cible.",
   "8654": "Allonge Ténébreuse",
-  "40327": "Quand votre héros gagne une MIRE, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés.",
+  "40327": "Quand votre héros attaque, une {#SHADOW} inflige {magicalDamage:perc} à la cible.",
   "30650": "Bombardement Cosmique",
-  "86009": "Quand votre héros gagne une MIRE, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires à plus de 3 cases.",
+  "86009": "Quand votre héros gagne une {#SIGHT}\\_: une {#WAVE} inflige {magicalDamageAndNext:perc} à l\u0027adversaire le plus proche.",
   "22728": "Ciblage Furtif",
-  "8477": "Quand votre héros gagne une MIRE, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le plus de {%PV}.",
+  "8477": "Quand vous lancez {value:s}\\_sorts dans le tour\\_: une {#wave} inflige {magicalDamageAndNext:dmg} à l’adversaire ayant le plus de {%PV}.",
   "88582": "Acharnement Vide",
-  "2840": "Quand votre héros gagne une MIRE, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le moins de {%PV}.",
+  "2840": "Quand vous jouez un sort avec un coût en {%PA} réduit sur un adversaire, une {#WAVE} inflige {magicalDamageAndNext:perc} à la cible.",
   "34980": "Allonge Rémanente",
-  "68408": "Quand votre héros gagne une MIRE, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés.",
+  "68408": "Quand votre héros attaque, une {#WAVE} inflige {magicalDamageAndNext:perc} à la cible.",
   "25208": "Bombardement Solaire",
-  "62782": "Quand votre héros gagne une MIRE, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires à plus de 3\\_cases.",
+  "62782": "Quand votre héros gagne une {#SIGHT}\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:perc} à l\u0027adversaire le plus proche.",
   "60245": "Ciblage Éclair",
-  "69203": "Quand votre héros gagne une MIRE, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le plus de {%PV}.",
+  "69203": "Quand vous jouez {value:s}\\_sorts dans le tour\\_: un {#lightning} inflige {physicalDamageAndNext:dmg} à l’adversaire ayant le plus de {%PV}.",
   "81537": "Acharnement Électrique",
-  "40348": "Quand votre héros gagne une MIRE, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le moins de {%PV}.",
+  "40348": "Quand vous jouez un sort avec un coût en {%PA} réduit sur un adversaire, un {#LIGHTNING} inflige {physicalDamageAndNext:perc} à la cible.",
   "21685": "Allonge Noble",
-  "15356": "Quand votre héros gagne une MIRE, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés.",
+  "15356": "Quand votre héros attaque, un {#LIGHTNING} inflige {physicalDamageAndNext:perc} à la cible.",
   "22677": "Bombardement Explosif",
-  "78222": "Quand votre héros gagne une MIRE, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires à plus de 3 cases.",
+  "78222": "Quand votre héros gagne une {#SIGHT}\\_: un {#METEOR} inflige {physicalDamageAndNext:perc} à l\u0027adversaire le plus proche.",
   "97874": "Ciblage Ardent",
-  "62121": "Quand votre héros gagne une MIRE, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le plus de {%PV}.",
+  "62121": "Quand vous jouez {value:s}\\_sorts dans le tour\\_: un {#meteor} inflige {physicalDamageAndNext:dmg} à l’adversaire ayant le plus de {%PV}.",
   "18481": "Acharnement Brûlant",
-  "91206": "Quand votre héros gagne une MIRE, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} à l\u0027adversaire ayant le moins de {%PV}.",
+  "91206": "Quand vous jouez un sort avec un coût en {%PA} réduit sur un adversaire, un {#METEOR} inflige {physicalDamageAndNext:perc} à la cible.",
   "81851": "Allonge Fumante",
-  "96217": "Quand votre héros gagne une MIRE, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires alignés avec lui.",
+  "96217": "Quand votre héros attaque, un {#METEOR} inflige {physicalDamageAndNext:perc} à la cible.",
   "56710": "Specific Dark 1 (48)",
   "64238": "Weapon specific dark skill",
   "53390": "Specific Empty 1 (819)",
@@ -402,89 +402,89 @@
   "43677": "Specific Magma 1 (266)",
   "19253": "Weapon specific magma skill",
   "46321": "Pic Sombre",
-  "61374": "Quand votre héros attaque, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant lui.",
+  "61374": "Quand votre héros se téléporte\\_: une {#shadow} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%pv}.",
   "46872": "Pic Cosmique",
-  "77163": "Quand votre héros attaque, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant lui.",
-  "27439": "Pic Lumineux",
-  "85702": "Quand votre héros attaque, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur les {cell:c} devant lui.",
+  "77163": "Quand votre héros se téléporte\\_: un {#wave} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
+  "27439": "Pic Foudroyant",
+  "85702": "Quand votre héros se téléporte\\_: un {#lightning} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "65130": "Pic Brûlant",
-  "65722": "Quand votre héros attaque, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires sur {cell:c} devant lui.",
+  "65722": "Quand votre héros se téléporte\\_: un {#meteor} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "17128": "Activation Malfaisante",
-  "9402": "Quand votre héros attaque, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Déclenche le pouvoir de vos MÉCANISMES.",
+  "9402": "Quand votre héros attaque\\_: une {#SHADOW} inflige {magicalDamageAndNext:dmg} sur la cible si vous n’avez pas de \u003cb\u003eSINISTRO\u003c/b\u003e en main.",
   "80748": "Sablier Funeste",
-  "99322": "Quand votre héros libère un {#AVENGERHOURGLASS}, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT}.",
+  "99322": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_: une {#SHADOW} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "80960": "Conversion Obscure",
-  "70707": "Quand votre héros attaque, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} par MÉCANISME allié en jeu.",
+  "70707": "Quand vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e\\_: une {#shadow} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "67524": "Réflexion Lunaire",
-  "7670": "Quand votre héros attaque, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nRejoue l\u0027effet si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "7670": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}\\_: une {#shadow} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%pv}.",
   "73686": "Activation Silencieuse",
-  "77076": "Quand votre héros attaque, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Déclenche le pouvoir de vos MÉCANISMES.",
+  "77076": "Quand votre héros attaque\\_: une {#WAVE} inflige {magicalDamageAndNext:dmg} sur la cible si vous n\u0027avez pas de \u003cb\u003eSINISTRO\u003c/b\u003e en main.",
   "92533": "Sablier Brisé",
-  "15081": "Quand votre héros libère un {#AVENGERHOURGLASS}, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT}.",
+  "15081": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_: une {#WAVE} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "45658": "Conversion Muette",
-  "85757": "Quand votre héros attaque, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} par MÉCANISME allié en jeu.",
+  "85757": "Quand vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e\\_: une {#wave} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "73391": "Réflexion Miroir",
-  "63574": "Quand votre héros attaque, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nRejoue l\u0027effet si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "63574": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}\\_: une {#wave} inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%pv}.",
   "38016": "Activation Vive",
-  "98018": "Quand votre héros attaque, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Déclenche le pouvoir de vos MÉCANISMES.",
+  "98018": "Quand votre héros attaque\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:dmg} sur la cible si vous n\u0027avez pas de \u003cb\u003eSINISTRO\u003c/b\u003e en main.",
   "32819": "Sablier Sacré",
-  "52103": "Quand votre héros libère un {#AVENGERHOURGLASS}, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT}.",
+  "52103": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_: un {#LIGHTNING} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "51962": "Conversion Électrique",
-  "63506": "Quand votre héros attaque, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} par MÉCANISME allié en jeu.",
+  "63506": "Quand vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e\\_: un {#lightning} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "66236": "Réflexion Solaire",
-  "64161": "Quand votre héros attaque, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nRejoue l\u0027effet si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "64161": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}\\_: un {#lightning} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%pv}.",
   "8688": "Activation Volcanique",
-  "28873": "Quand votre héros attaque, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\n{#DEATHBLOW!}\\_: Déclenche le pouvoir de vos MÉCANISMES.",
+  "28873": "Quand votre héros attaque\\_: un {#METEOR} inflige {physicalDamageAndNext:dmg} sur la cible si vous n\u0027avez pas de \u003cb\u003eSINISTRO\u003c/b\u003e en main.",
   "63829": "Sablier Volcanique",
-  "24132": "Quand votre héros libère un {#AVENGERHOURGLASS}, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT}.",
+  "24132": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_: un {#METEOR} inflige {physicalDamageAndNext:dmg} à l’adversaire ayant le plus de {%PV}.",
   "48013": "Conversion Explosive",
-  "35168": "Quand votre héros attaque, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} par MÉCANISME allié en jeu.",
+  "35168": "Quand vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e\\_: un {#meteor} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%PV}.",
   "64756": "Réflexion Ardente",
-  "80330": "Quand votre héros attaque, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT}.\n\\---\nRejoue l\u0027effet si vous avez au moins {value:pa}\\_{%PA} dans votre {%reserve}.",
+  "80330": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}\\_: un {#meteor} inflige {physicalDamageAndNext:dmg} à l\u0027adversaire ayant le plus de {%pv}.",
   "26928": "Compétences",
   "72396": "Apparences",
   "58716": "Récupération Sordide",
-  "20219": "{#DEATHBLOW!}\\_: une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} à un adversaire aléatoire.\n\\---\nAjoute le sort {Spell:65351} à votre main.",
+  "20219": "{#DEATHBLOW!}\\_: votre héros se soigne de {healAndNext:pv}.",
   "76784": "Bouclier Funeste",
-  "70226": "Quand votre héros perd son {#SHIELD}, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} à un adversaire aléatoire.\n\\---\nAjoute le sort {Spell:65351} à votre main.",
+  "70226": "Quand votre héros perd {#SHIELD}\\_: il se soigne de {healAndNext:heal}.",
   "23346": "Atterrissage Obscure",
-  "81762": "Quand votre héros se téléporte, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de sa case d\u0027arrivée.\n\\---\nAjoute le sort {Spell:65351} à votre main.",
+  "81762": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, une {#SHADOW} inflige {magicalDamageAndNext:dmg} sur l\u0027adversaire ayant le plus de {%PV}.",
   "19544": "Âme Corrompue",
-  "23193": "Remplace votre sort \u003cb\u003eAPPEL SPECTRAL\u003c/b\u003e par le sort {Spell:278}.\n\\---\nConfère {valueAndNext:perc}% de l\u0027{%AT} de votre héros à vos {Summoning:644[ÂMES CORROMPUES]}.",
+  "23193": "Ajoute le sort {Spell:278} dans votre deck.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Votre héros se soigne de {healAndNext:pv} si votre {Summoning:644} est en jeu.",
   "42773": "Récupération Miroir",
-  "22666": "{#DEATHBLOW!}\\_: Se soigne de {valueAndNext:perc}% de son {%AT} et ajoute le sort {Spell:38} à votre main.",
+  "22666": "{#DEATHBLOW!}\\_: vous gagnez {valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "93468": "Bouclier Éthéré",
-  "80423": "Quand votre héros perd un {#SHIELD}, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.\n\\---\nAjoute le sort {Spell:38} à votre main.",
+  "80423": "Quand votre héros perd {#SHIELD}\\_: vous gagnez {valueAndNext:boost}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "54892": "Atterrissage Furtif",
-  "24999": "Quand votre héros se téléporte, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à sa case d\u0027arrivée.\n\\---\nAjoute le sort {Spell:38} à votre main.",
+  "24999": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, une {#WAVE} inflige {magicalDamageAndNext:dmg} sur l\u0027adversaire ayant le plus de {%PV}.",
   "19796": "Âme Vide",
-  "13319": "Remplace votre sort \u003cb\u003eAPPEL SPECTRAL\u003c/b\u003e par le sort {Spell:731}.\n\\---\nConfère {valueAndNext:at}% de l\u0027{%AT} de votre héros à vos {Summoning:204[ÂMES VIDES]}.\n\\---\nQuand une de vos {Summoning:204} attaque, une {#WAVE} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros.",
+  "13319": "Ajoute le sort {Spell:731} à votre deck.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué si votre {Summoning:204} est en jeu.",
   "54254": "Récupération Sacrée",
-  "56510": "{#DEATHBLOW!}\\_: Se soigne de {valueAndNext:perc}% de son {%AT}.",
+  "56510": "{#DEATHBLOW!}\\_: Votre héros gagne +{valueAndNext:at}% aux dégâts physiques jusqu\u0027à sa prochaine attaque.",
   "42097": "Bouclier Étincelant",
-  "93845": "Quand votre héros perd son {#SHIELD}, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "93845": "Quand votre héros perd {#SHIELD}\\_: il gagne +{valueAndNext:boost}% aux dégâts physiques pour le tour.",
   "90065": "Atterrissage Foudroyant",
-  "82215": "Quand votre héros se téléporte, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de sa case d\u0027arrivée.",
+  "82215": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, un {#LIGHTNING} inflige {physicalDamageAndNext:dmg} sur l\u0027adversaire ayant le plus de {%PV}.",
   "72292": "Âme Céleste",
-  "5784": "Remplace votre sort \u003cb\u003eAPPEL SPECTRAL\u003c/b\u003e par le sort {Spell:426}.",
-  "24388": "Récupération Minéral",
-  "75707": "{#DEATHBLOW!}\\_: Gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:perc}% de son {%AT}.",
+  "5784": "Ajoute le sort {Spell:426} dans votre deck.\n\\_\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : votre héros gagne +{valueAndNext:at}% aux dégâts physiques pour le tour si votre {Summoning:236} est en jeu.",
+  "24388": "Récupération Minérale",
+  "75707": "{#DEATHBLOW!}\\_: Votre héros gagne {armorAndNext:ar}.",
   "93952": "Bouclier Solide",
-  "72594": "Quand votre héros perd son {#SHIELD}, il gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:perc}% de son {%AT}.",
+  "72594": "Quand votre héros perd {#SHIELD}\\_: il gagne {armorAndNext:ar}.",
   "88557": "Atterrissage Grondant",
-  "79862": "Quand votre héros se téléporte, il gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:perc}% de son {%AT} par adversaire autour\\_\u003csprite name\u003dcell_around\u003e de sa case d\u0027arrivée.",
+  "79862": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, un {#METEOR} inflige {physicalDamageAndNext:dmg} sur l\u0027adversaire ayant le plus de {%PV}.",
   "83127": "Âme Volcanique",
-  "81318": "Remplace votre sort \u003cb\u003eAPPEL SPECTRAL\u003c/b\u003e par le sort {Spell:285}.\n\\---\nConfère {valueAndNext:at}% de l\u0027{%AT} de votre héros à vos {Summoning:350[ÂMES VOLCANIQUES]}.",
+  "81318": "Ajoute le sort {Spell:285} dans votre deck.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{armorAndNext:ar} à votre héros si votre {Summoning:350} est en jeu.",
   "7880": "Vol de Vie",
-  "95111": "CC de l\u0027Arme",
-  "29071": "Dégâts CC de l\u0027Arme",
+  "95111": "CC Physiques",
+  "29071": "Dégâts CC Physiques",
   "44203": "Gains d\u0027AR",
   "64552": "Soins",
   "33884": "Drops de Kamas",
   "71798": "Bonus aux Charges",
-  "20556": "CC des Sorts",
+  "20556": "CC Magiques",
   "59505": "",
-  "66954": "Augmente les dégâts Critiques de +{value:stat}%.",
+  "66954": "Augmente les dégâts Critiques de +{value:(stat/10)}%.",
   "77018": "",
   "8864": "Augmente l\u0027Esquive de +{value:(stat/10)}%.",
   "39677": "",
@@ -504,7 +504,7 @@
   "42017": "",
   "39839": "Augmente les chances de Critiques de +{value:(stat/10)}%.",
   "41276": "",
-  "39902": "Augmente les dégâts Critiques de +{value:stat}%.",
+  "39902": "Augmente les dégâts Critiques de +{value:(stat/10)}%.",
   "82801": "",
   "63580": "Augmente les {%pv} de +{value:stat}%.",
   "89651": "",
@@ -514,7 +514,7 @@
   "50859": "",
   "71110": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Ajoute {value:p0}\\_{%pa} supplémentaire à votre {%reserve}.",
   "2744": "",
-  "98212": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Repousse les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.",
+  "98212": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: {#PUSH} les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.",
   "7378": "",
   "2599": "Augmente la Résistance Magique de {value:(mag/10)}%.\nAugmente la Résistance Physique de {value:(phy/10)}%.",
   "87907": "",
@@ -545,8 +545,6 @@
   "93286": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Soigne aussi les héros autre que le votre d\u0027une valeur égale à son {%AT}.",
   "54447": "",
   "67503": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Soigne une fois supplémentaire votre héros d\u0027une valeur égale à son {%at}.",
-  "35919": "",
-  "38079": "Augmente sa portée d\u0027invocation de {cell:c}.\n[DEV NEEDED]",
   "18331": "",
   "59142": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Déclenche une {#explosion} d\u0027une valeur égale à son {%AT} si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e, \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e ou \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
   "99136": "",
@@ -624,7 +622,7 @@
   "58320": "",
   "47906": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Traverse sa cible.",
   "46782": "Repli du Torrent",
-  "8026": "Si à la fin du déplacement de votre héros aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around\u003e de lui\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner {#UNTARGETABLE} jusqu\u0027au prochain tour allié.",
+  "8026": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si aucun adversaire n\u0027est adjacent\\_\u003csprite name\u003dcell_cross\u003e à votre héros, il se soigne de {healAndNext:pv}.",
   "75831": "",
   "18465": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Réduit de {value:(-1*pa)}\\_{%pa} le coût du prochain sort joué ce tour si au moins {value:v}\\_adversaires sont touchés par son {#BOUNCE}.",
   "13938": "",
@@ -635,10 +633,10 @@
   "85359": "Augmente les chances de Critiques de +{value:(stat/10)}%.",
   "61188": "",
   "22006": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: {#ROOTED[IMMOBILISE]} les adversaires autour\\_\u003csprite name\u003dcell_around\u003e.",
-  "22689": "Portée Augmentée",
-  "74703": "Augmente sa portée d\u0027invocation de {cell:c}.",
+  "22689": "",
+  "74703": "+{value:k}% de kamas obtenus sur les monstres.",
   "11248": "",
-  "53444": "Augmente les dégâts Critiques de +{value:stat}%.",
+  "53444": "Augmente les dégâts Critiques de +{value:(stat/10)}%.",
   "2868": "",
   "44767": "\u003cb\u003eMORT\u003c/b\u003e\\_: {addWater:water}.",
   "71769": "",
@@ -667,11 +665,11 @@
   "50478": "",
   "82017": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Confère {#UNTARGETABLE} jusqu\u0027au prochain tour allié aux alliés adjacents\\_\u003csprite name\u003dcell_cross\u003e.",
   "64019": "",
-  "62042": "Augmente les dégâts Critiques de +{value:stat}%.",
+  "62042": "Augmente les dégâts Critiques de +{value:(stat/10)}%.",
   "56000": "",
   "97414": "",
   "43258": "",
-  "62087": "Augmente les dégâts Critiques de +{value:stat}%.",
+  "62087": "Augmente les dégâts Critiques de +{value:(stat/10)}%.",
   "7335": "",
   "15574": "Augmente l\u0027{%at} de {value:stat}%.",
   "7979": "",
@@ -775,13 +773,13 @@
   "74865": "",
   "49008": "Augmente l\u0027{%at} de {value:stat}%.",
   "75023": "",
-  "25775": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:dmg}%.",
+  "25775": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:(dmg/10)}%.",
   "4724": "",
   "39417": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Confère {#SHIELD} à votre héros.",
   "58499": "",
   "20143": "Augmente l\u0027Esquive de +{value:(stat/10)}%.",
   "32892": "",
-  "6317": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:dmg}%.",
+  "6317": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:(dmg/10)}%.",
   "96368": "",
   "37255": "-{value:pa}\\_{%PA} au coût du sort {Spell:159} jusqu\u0027à ce qu\u0027il soit joué quand un compagnon ou un héros allié meurt.",
   "85893": "",
@@ -791,131 +789,131 @@
   "22159": "",
   "75187": "",
   "13260": "Écho Corrompu",
-  "71328": "Quand vous déclenchez {#BOUNCE}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros en {#BOUNCE}.\n\\---\nAjoute le sort {Spell:65351} à votre main si vous touchez au moins 3 adversaires.",
+  "71328": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si vous avez pioché au moins {value:nb} sorts dans le tour, votre héros se soigne de {healAndNext:pv}.",
   "31417": "Assaut Nocturne",
-  "37146": "Quand vous jouez un sort d\u0027au moins 6\\_{%PA}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nAjoute ensuite le sort {Spell:65351} à votre main.",
+  "37146": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_{#SIGHT[MIRES]}, il se soigne de {healAndNext:pv}.",
   "37829": "Exécution Funeste",
-  "41101": "Quand vous achevez un adversaire, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\\---\nAjoute ensuite le sort {Spell:65351} à votre main.",
+  "41101": "Quand vous lancez un sort sur un adversaire à {cell:c} ou moins de votre héros, il se soigne de {healAndNext:pv}.",
   "22376": "Projection Sordide",
-  "2217": "Quand vous jouez un sort sur un adversaire aligné avec votre héros, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nAjoute le sort {Spell:65351} à votre main si la cible se trouve à au moins 3\\_cases de votre héros.",
+  "2217": "Quand vous lancez un sort sur un adversaire aligné à votre héros, il se soigne de {healAndNext:pv}.",
   "30827": "Écho Miroir",
-  "567": "Quand vous déclenchez {#BOUNCE}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros en {#BOUNCE}.\n\\---\nAjoute le sort {Spell:38} à votre main si vous touchez au moins 3 adversaires.",
+  "567": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si vous avez pioché au moins {value:nb}\\_sorts dans le tour, vous gagnez +{valueAndNext:buffM}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "28566": "Assaut Instable",
-  "69796": "Quand vous jouez un sort d\u0027au moins 6\\_{%PA}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nAjoute ensuite le sort {Spell:38} à votre main.",
+  "69796": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_{#SIGHT[MIRES]}, vous gagnez +{valueAndNext:buffM}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "80041": "Exécution Muette",
-  "48502": "Quand vous achevez un adversaire, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\\---\nAjoute ensuite le sort {Spell:38} à votre main.",
+  "48502": "Quand vous lancez un sort sur un adversaire à {cell:c} ou moins de votre héros, vous gagnez +{valueAndNext:mg}%\\_aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "64927": "Projection d\u0027Onde",
-  "82541": "Quand vous jouez un sort sur un adversaire aligné avec votre héros, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nAjoute le sort {Spell:38} à votre main si la cible se trouve à au moins 3\\_cases de votre héros.",
+  "82541": "Quand vous lancez un sort sur un adversaire aligné à votre héros, vous gagnez +{valueAndNext:at}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "83377": "Écho Radieux",
-  "75421": "Quand vous déclenchez {#BOUNCE}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros en {#BOUNCE}.",
+  "75421": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si vous avez pioché au moins {value:nb} sorts dans le tour, votre héros gagne +{valueAndNext:buffP}% aux dégâts physiques pour le tour.",
   "41392": "Assaut Céleste",
-  "6705": "Quand vous jouez un sort d\u0027au moins 6\\_{%PA}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.",
+  "6705": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_{#SIGHT[MIRES]}, il gagne +{valueAndNext:buffP}% aux dégâts physiques jusqu’à sa prochaine attaque.",
   "80329": "Exécution Sacrée",
-  "74441": "Quand vous achevez un adversaire, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "74441": "Quand vous lancez un sort sur un adversaire à {cell:c} ou moins de votre héros, il gagne +{valueAndNext:dmg}%\\_aux\\_dégâts physiques pour le tour.",
   "57617": "Projection Étincelante",
-  "63269": "Quand vous jouez un sort sur un adversaire aligné avec votre héros, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.",
+  "63269": "Quand vous jouez un sort sur un adversaire aligné à votre héros, il gagne +{valueAndNext:at}% aux dégâts physiques jusqu’à sa prochaine attaque.",
   "61959": "Écho Bruyant",
-  "53153": "Quand vous déclenchez {#BOUNCE}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros en {#BOUNCE}.\n\\---\nVotre héros gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:(perc2/10)}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e si vous touchez au moins 3 adversaires.",
+  "53153": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si vous avez pioché au moins {value:nb}\\_sorts dans le tour, votre héros gagne {armorAndNext:ar}.",
   "80903": "Assaut Volcanique",
-  "14334": "Quand vous jouez un sort d\u0027au moins 6\\_{%PA}, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros et votre héros gagne de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:(perc2/10)}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e.",
+  "14334": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_{#SIGHT[MIRES]}, il gagne {armorAndNext:ar}.",
   "73160": "Exécution Profonde",
-  "15415": "Quand vous achevez un adversaire, déclenche inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros sur les adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\\---\nVotre héros gagne ensuite de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:(perc2/10)}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e.",
+  "15415": "Quand vous lancez un sort sur un adversaire à {cell:c} ou moins de votre héros, il gagne +{armorAndNext:ar}.",
   "74815": "Projection Minérale",
-  "62711": "Quand vous jouez un sort sur un adversaire aligné avec votre héros, inflige {valueAndNext:(perc/10)}% des {%PV}\u003cb\u003eMAX\u003c/b\u003e de votre héros.\n\\---\nVotre héros gagne ensuite de l\u0027{%AR} d\u0027une valeur égale à {valueAndNext:(perc2/10)}% de ses {%PV}\u003cb\u003eMAX\u003c/b\u003e si la cible se trouve à au moins 3\\_cases de lui.",
+  "62711": "Quand vous lancez un sort sur un adversaire aligné à votre héros, il gagne +{armorAndNext:ar}.",
   "66616": "Affûtage Aérien",
-  "75554": "Quand vous jouez un sort \u003cb\u003eAIR\u003c/b\u003e\u003csprite name\u003dwind\u003e avec \u003cb\u003ePRÉCISION\u003c/b\u003e\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:nb}\\_\u003cb\u003eMIRES\u003c/b\u003e.",
+  "75554": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_{#sight[MIRES]}, {valueAndNext:(perc/10)}% de chance de piocher votre prochain sort {#ACCURACY}.",
   "43894": "Ruse Réfléchie",
-  "7300": "DÉBUT DU TOUR : votre héros a {valueAndNext:(perc/10)}% de chance de gagner 1\\_{%PM} pour le tour, par adversaire adjacent\\_\u003csprite name\u003dcell_cross\u003e à lui.",
+  "7300": "Quand vous piochez un sort\\_: vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "16805": "Repli de l\u0027Ouragan",
-  "59710": "Quand vous lancez un sort sur un adversaire aligné à votre héros\\_: votre héros a {valueAndNext:(perc/10)}% de chance de reculer de {cell:c} .",
+  "59710": "Quand vous jouez un sort sur un adversaire à {cell:c} ou moins de votre héros\\_: inflige {magicalDamageAndNext:dmg} et retire 1\\_{%PM} à la cible.",
   "58965": "Archer du Ciel",
-  "92338": "DÉBUT DU TOUR\\_:  le coût du prochain sort avec \u003cb\u003ePRÉCISION\u003c/b\u003e que vous jouez a {valueAndNext:(perc/10)}% de chance d\u0027être réduit de {value:pa}\\_{%PA}.",
+  "92338": "Quand votre héros libère une {#SIGHT} sur un adversaire ayant l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e\\_: inflige {magicalDamageAndNext:dmg} en {#BOUNCE}.",
   "25497": "Affûtage Brûlant",
-  "51116": "Quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e avec \u003cb\u003ePRÉCISION\u003c/b\u003e :\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:nb}\\_\u003cb\u003eMIRES\u003c/b\u003e.",
+  "51116": "Quand votre héros libère une {#SIGHT}, il déclenche {explosionAndNext:dmg}.",
   "70014": "Ruse Agressive",
-  "68003": "Quand votre héros subit une \u003cb\u003eattaque\u003c/b\u003e\\_:\nil a {valueAndNext:(perc/10)}% de chance de déclencher une {#EXPLOSION} infligeant {value:at}% de son\\_{%AT}.",
+  "68003": "Quand votre héros attaque un adversaire en ayant au moins une {#SIGHT}, il inflige {physicalDamageAndNext:dmg}.",
   "38898": "Repli du Volcan",
-  "52438": "Quand votre héros subit une \u003cb\u003eattaque\u003c/b\u003e\\_:\nil a {valueAndNext:(perc/10)}% de chance d\u0027infliger son {%AT} à son attaquant.",
+  "52438": "Quand vous jouez un sort sur un adversaire à au moins {cell:c} de votre héros, vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "40003": "Archer du Désert",
-  "59376": "Quand vous jouez un sort avec \u003cb\u003ePRÉCISION\u003c/b\u003e\\_:\nvous avez {valueAndNext:(perc/10)}% de chance de réduire de {value:at}% l\u0027{%AT} de la cible pour le tour.",
+  "59376": "Quand votre héros libère une {#SIGHT} sur un adversaire ayant l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e\\_: déclenche {explosionAndNext:explo} sur la cible.",
   "91564": "Affûtage Argileux",
-  "48504": "Quand vous jouez un sort \u003cb\u003eTERRE\u003c/b\u003e\u003csprite name\u003dearth\u003e avec \u003cb\u003ePRÉCISION\u003c/b\u003e\\_: votre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:nb}\\_\u003cb\u003eMIRES\u003c/b\u003e.",
+  "48504": "Quand votre héros gagne une {#SIGHT}\\_: il gagne {armorAndNext:ar}.",
   "34262": "Ruse Prudente",
-  "44848": "FIN DU TOUR\\_: votre héros a {valueAndNext:(perc/10)}% de chance d\u0027{#ROOTED} les adversaires jusqu\u0027à 2 cases.",
+  "44848": "Quand votre héros subit une attaque à distance\\_: {valueAndNext:(perc/10)}% de chance de gagner {#shield}.\n(1 fois par tour)",
   "31009": "Repli de la Montagne",
-  "42246": "Si à la fin du déplacement de votre héros aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around\u003e de lui\\_: votre héros a {valueAndNext:(perc/10)}% de chance de gagner {#SHIELD}.",
+  "42246": "Si votre héros arrive à {cell:c} ou moins d\u0027un adversaire, il gagne {armorAndNext:ar}.",
   "85403": "Archer des Landes",
-  "40606": "Quand votre héros commence son tour sans \u003cb\u003eMIRE\u003c/b\u003e : il a {valueAndNext:(perc/10)}% de chance de gagner {value:nb}\\_\u003cb\u003eMIRE\u003c/b\u003e.",
+  "40606": "Quand votre héros libère une {#SIGHT} sur un adversaire ayant l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e\\_: inflige {physicalDamageAndNext:dmg} aux adversaires adjacents \u003csprite name\u003dcell_cross/\u003e .",
   "7506": "Affûtage Humide",
-  "11358": "Quand vous jouez un sort \u003cb\u003eEAU\u003c/b\u003e\u003csprite name\u003dwater\u003e avec \u003cb\u003ePRÉCISION\u003c/b\u003e\\_:\nvotre héros a  {valueAndNext:(perc/10)}% de chance de gagner {value:nb}\\_\u003cb\u003eMIRES\u003c/b\u003e.",
+  "11358": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins {value:s}\\_{#sight[MIRES]}, il se soigne de {healAndNext:pv}.",
   "8147": "Ruse Concentrée",
-  "19281": "Quand votre héros subit des dégâts magiques\\_:\nil a {valueAndNext:(perc/10)}% de chance d\u0027ajouter {addReserve:r}.",
+  "19281": "Quand vous jouez un sort sur un adversaire à au moins {cell:c} de votre héros, {valueAndNext:(perc/10)}% de chance d\u0027ajouter {addReserve:pa}.\n(1 fois par tour)",
   "37794": "Archer des Mers",
-  "50837": "Si à la fin du tour aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around\u003e de votre héros\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:nb}\\_\u003cb\u003eMIRE\u003c/b\u003e.",
+  "50837": "Quand votre héros libère une {#SIGHT} sur un adversaire ayant l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet/\u003e\\_: il se soigne de {healAndNext:pv} par adversaire autour \u003csprite name\u003dcell_around/\u003e  de la cible.",
   "1750": "Rouage Corrompu",
-  "71412": "Quand un MÉCANISME est transformé, une {#SHADOW} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires jusqu\u0027à {cell:c} de lui.\n\\---\nAjoute ensuite le sort {Spell:65351} à votre main.",
+  "71412": "Quand un \u003cb\u003eMÉCANISME\u003c/b\u003e allié déclenche son pouvoir, votre héros se soigne de {healAndNext:pv}.",
   "51162": "Cuirasse Sordide",
-  "98131": "Quand votre héros perd de l\u0027{%AR}, une {#SHADOW} inflige {valueAndNext:perc}% de son {%AT} à un adversaire aléatoire.\n\\---\nAjoute ensuite le sort {Spell:65351} à votre main.",
+  "98131": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, il se soigne de {healAndNext:pv}.",
   "72600": "Réglage Sadique",
-  "32091": "Quand vous construisez un MÉCANISME, une {#SHADOW} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros à un adversaire aléatoire.\n\\---\nQuand un MÉCANISME allié est détruit, ajoute le sort {Spell:65351} à votre main.",
+  "32091": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Votre héros se soigne de {healAndNext:pv} par \u003cb\u003eSINISTRO\u003c/b\u003e allié.",
   "51932": "Accumulation Sournoise",
-  "43731": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}, une {#SHADOW} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires.\n\\---\nAjoute ensuite le sort {Spell:65351} à votre main.",
+  "43731": "Quand vous utilisez au moins {value:(-pa)}\\_{%PA} de {%reserve}\\_: votre héros se soigne de {healAndNext:pv}.",
   "54554": "Rouage Vide",
-  "40250": "Quand un MÉCANISME est transformé, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires jusqu\u0027à {cell:c} de lui.\n\\---\nAjoute ensuite le sort {Spell:38} à votre main.",
+  "40250": "Quand un \u003cb\u003eMÉCANISME\u003c/b\u003e allié déclenche son pouvoir\\_: vous gagnez +{valueAndNext:magic}% aux dégâts magiques pour le tour.",
   "37096": "Cuirasse Éthérée",
-  "3189": "Quand votre héros perd de l\u0027{%AR}, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents \u003csprite name\u003dcell_cross\u003e à lui.\n\\---\nAjoute ensuite le sort {Spell:38} à votre main.",
+  "3189": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e : Si au moins {value:ad}\\_adversaires sont autour \u003csprite name\u003dcell_around\u003e de votre héros, vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "29227": "Réglage Instable",
-  "28376": "Quand vous construisez un MÉCANISME, une {#WAVE} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.\n\\---\nQuand un MÉCANISME allié est détruit , ajoute le sort {Spell:38} à votre main.",
+  "28376": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Vous gagnez +{valueAndNext:buffM}% aux dégâts magiques par \u003cb\u003eSINISTRO\u003c/b\u003e allié jusqu\u0027au prochain sort joué.",
   "82346": "Accumulation Rémanente",
-  "92600": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}, une {#WAVE} inflige {valueAndNext:perc}% de son {%AT} aux adversaires.\n\\---\nAjoute ensuite le sort {Spell:38} à votre main.",
+  "92600": "Quand vous utilisez au moins {value:(-pa)}\\_{%PA} de {%reserve}\\_: vous gagnez +{value:buffM}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "39846": "Rouage Éblouissant",
-  "54887": "Quand un MÉCANISME est transformé, un {#LIGHTNING} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires jusqu\u0027à {cell:c} de lui.",
+  "54887": "Quand un \u003cb\u003eMÉCANISME\u003c/b\u003e allié déclenche son pouvoir\\_: votre héros gagne +{valueAndNext:at}% aux dégâts physiques pour le tour.",
   "79160": "Cuirasse Étincelante",
-  "66375": "Quand votre héros perd de l\u0027{%AR}, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires autour \u003csprite name\u003dcell_around\u003e de lui.",
+  "66375": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, , il gagne +{valueAndNext:at}% aux dégâts physiques jusqu’à sa prochaine attaque.",
   "87215": "Réglage Noble",
-  "6978": "Quand vous construisez un MÉCANISME, un {#LIGHTNING} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "6978": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Votre héros gagne +{value:buffP}% aux dégâts physiques par \u003cb\u003eSINISTRO\u003c/b\u003e jusqu\u0027à sa prochaine attaque.",
   "71711": "Accumulation Céleste",
-  "35981": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}, un {#LIGHTNING} inflige {valueAndNext:perc}% de son {%AT} aux adversaires.",
+  "35981": "Quand vous utilisez au moins {value:(-pa)}\\_{%PA} de {%reserve}\\_: votre héros gagne +{valueAndNext:buffP}% aux dégâts physiques jusqu\u0027à sa prochaine attaque.",
   "41519": "Rouage Minéral",
-  "59145": "Quand un MÉCANISME est transformé, confère +{valueAndNext:perc}% de {%BL} aux MÉCANISMES alliés jusqu\u0027à {cell:c} de lui.",
+  "59145": "Quand un \u003cb\u003eMECANISME\u003c/b\u003e allié déclenche son pouvoir\\_: votre héros gagne {armorAndNext:ar}.",
   "17538": "Cuirasse Solide",
-  "98380": "Quand votre héros perd de l\u0027{%AR}, un {#METEOR} inflige {valueAndNext:perc}% de son {%AT} aux adversaires adjacents \u003csprite name\u003dcell_cross\u003e à lui.",
+  "98380": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si au moins {value:ad}\\_adversaires sont autour\\_\u003csprite name\u003dcell_around\u003e de votre héros, il gagne {armorAndNext:ar}.",
   "61175": "Réglage Fumant",
-  "35859": "Quand vous construisez un MÉCANISME, confère +{valueAndNext:perc}% de {%BL} aux MÉCANISMES alliés.",
+  "35859": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Votre héros gagne {armorAndNext:ar} par \u003cb\u003eSINISTRO\u003c/b\u003e allié.",
   "35033": "Accumulation Magmatique",
-  "96072": "Quand vous atteignez {value:pa}\\_{%PA} de {%reserve}, un {#METEOR} inflige {valueAndNext:perc}% de l\u0027{%AT} de votre héros aux adversaires.",
+  "96072": "Quand vous utilisez au moins {value:(-pa)}\\_{%PA} de {%reserve}\\_: votre héros gagne {armorAndNext:ar}.",
   "49355": "Cycle Aérien",
-  "48937": "Quand vous jouez un sort \u003cb\u003eAIR\u003c/b\u003e\u003csprite name\u003dwind\u003e\\_:\nvous avez {valueAndNext:(perc/10)}% de chance d\u0027ajouter +{value:r}\\_{%pa} à votre {%reserve} .",
+  "48937": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: S\u0027il vous reste au moins {value:pa}\\_{%PA}, inflige {magicalDamageAndNext:dmg} à l\u0027adversaire ayant le moins de {%PV}.",
   "79020": "Construction Réfléchie",
-  "67485": "Quand un \u003cb\u003eMÉCANISME\u003c/b\u003e allié est détruit\\_:\nvous avez {valueAndNext:(perc/10)}% de chance de piocher votre prochain \u003cb\u003eMÉCANISME\u003c/b\u003e .",
+  "67485": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Vous gagnez +{valueAndNext:buffM}% aux dégâts magiques par \u003cb\u003eMÉCANISME\u003c/b\u003e allié pour le tour.",
   "62055": "Étude de l\u0027Ouragan",
-  "1843": "Quand un sort REMBOBINAGE entre en main\\_:\nle coût du prochain sort REMBOBINAGE que vous jouez a {valueAndNext:(perc/10)}% de chance d\u0027être réduit de {value:pa}\\_{%PA}.",
+  "1843": "Quand vous déplacez un adversaire\\_: lui inflige {magicalDamageAndNext:dmgM}.",
   "65326": "Science du Ciel",
-  "78035": "À la fin de votre tour\\_:\nvous avez {valueAndNext:(perc/10)}% de chance de piocher un sort supplémentaire.",
+  "78035": "Quand un sort revient dans votre main\\_: vous gagnez +{valueAndNext:buffM}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "73535": "Cycle Brûlant",
-  "22481": "Quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e\\_:\nvous avez {valueAndNext:(perc/10)}% de chance d\u0027ajouter +{value:r}\\_{%pa} à votre {%reserve}.",
+  "22481": "Quand vous jouez un sort coûtant au moins {value:pa}\\_{%PA}\\_: votre héros gagne +{valueAndNext:buffP}% aux dégâts physiques pour le tour.",
   "27488": "Cycle Humide",
-  "27698": "Quand vous jouez un sort \u003cb\u003eEAU\u003c/b\u003e\u003csprite name\u003dwater\u003e\\_:\nvous avez {valueAndNext:(perc/10)}% de chance d\u0027ajouter +{value:r}\\_{%pa} à votre {%reserve}.",
+  "27698": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:  Si vous avez au moins {value:pa}\\_{%PA} dans votre {%RESERVE}, votre héros se soigne \\vde {healAndNext:pv}.",
   "83978": "Cycle Argileux",
-  "70846": "Quand vous jouez un sort \u003cb\u003eTERRE\u003c/b\u003e\u003csprite name\u003dearth\u003e\\_:\nvous avez {valueAndNext:(perc/10)}% de chance d\u0027ajouter +{value:r}\\_{%pa} à votre {%reserve}.",
+  "70846": "Quand vous utilisez votre {%RESERVE}\\_: votre héros gagne {armorAndNext:ar}.",
   "35976": "Construction Prudente",
-  "37118": "Quand vous construisez un SINISTRO\\_:\nvous avez {valueAndNext:(perc/10)}% de chance de doubler ses {%BL}.",
+  "37118": "Quand un \u003cb\u003eMÉCANISME\u003c/b\u003e déclenche son pouvoir\\_: il gagne {blindageAndNext:bl}.",
   "71096": "Étude de la Montagne",
-  "3497": "Quand vous téléportez un de vos \u003cb\u003eMÉCANISMES\u003c/b\u003e\\_:\nil a {valueAndNext:(perc/10)}% de chance de gagner {#SHIELD}.",
+  "3497": "Quand vous jouez un sort sur un adversaire à {cell:c} ou moins de votre héros, il gagne {armorAndNext:ar}.",
   "66445": "Science des Landes",
-  "33937": "Quand vous utilisez votre {%RESERVE}\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner de l\u0027{%AR} d\u0027une valeur égale à {value:percAt}% de ses {%PV}\u003cb\u003eMAX\u003c/B\u003e .",
+  "33937": "Quand votre héros subit une attaque au corps à corps\\_: vous gagnez +{valueAndNext:mp}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "70296": "Construction Agressive",
-  "23653": "Quand le pouvoir d\u0027un de vos \u003cb\u003eMÉCANISMES\u003c/b\u003e se déclenche\\_: il a {valueAndNext:(perc/10)}% de chance de se déclencher à nouveau.",
+  "23653": "Quand un \u003cb\u003eMÉCANISME\u003c/b\u003e allié est détruit\\_: votre héros déclenche {explosionAndNext:dmg}.",
   "12907": "Étude du Volcan",
-  "58664": "Quand votre héros se téléporte\\_:\nil a {valueAndNext:(perc/10)}% de chance de déclencher une {#EXPLOSION} d\u0027une valeur égale à {value:percAt}% de son {%AT}.",
+  "58664": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_: il déclenche {explosionAndNext:dmg}.",
   "11819": "Science du Désert",
-  "42587": "Quand vous utilisez votre {%RESERVE}\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de gagner {value:percAt}% d\u0027{%AT} pour le tour.",
+  "42587": "Si vous jouez au moins {value:s}\\_sorts dans le tour\\_: votre héros gagne +{valueAndNext:buffP}% aux dégâts physiques pour le tour.",
   "59085": "Construction Concentrée",
-  "60486": "Quand vous transformez un de vos \u003cb\u003eMÉCANISMES\u003c/b\u003e\\_:\nvous avez {valueAndNext:(perc/10)}% de chance de doubler ses {%BL}.",
+  "60486": "Quand vous transformez un de vos \u003cb\u003eMÉCANISMES\u003c/b\u003e\\_: votre héros et vos alliés se soignent de {healAndNext:pv}.",
   "64642": "Étude du Torrent",
-  "97686": "Quand vous jouez un sort REMBOBINAGE\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance d\u0027infliger {value:percAt}% de son {%AT} à la cible.",
+  "97686": "Quand vous utilisez au moins {value:(-pa)}\\_{%PA} de {%RESERVE}\\_: vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
   "84700": "Science des Mers",
-  "69343": "Quand des {%PA} sont ajoutés à votre {%RESERVE}\\_:\nvotre héros a {valueAndNext:(perc/10)}% de chance de se soigner de {value:percAt}% de ses {%PV}\u003cb\u003e MAX\u003c/b\u003e.",
+  "69343": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si votre héros possède au moins une \u003cb\u003eAURA\u003c/b\u003e, inflige {magicalDamageAndNext:dmg} à l’adversaire ayant le plus de {%PV}.",
   "86760": "Specific Dark 2 (150)",
   "97014": "Weapon specific dark skill",
   "30523": "Specific Dark 2 (702)",
@@ -974,8 +972,6 @@
   "32728": "God fire skill",
   "14219": "God Fire (6461)",
   "41187": "God fire skill",
-  "1805": "God Fire (83)",
-  "1262": "God fire skill",
   "98491": "God Water (23)",
   "47723": "God water skill",
   "47621": "God Water (60)",
@@ -1175,19 +1171,837 @@
   "77557": "God Water (560)",
   "463": "God water skill",
   "51930": "Attention, vous ne pouvez avoir qu\u0027une seule voie héroïque déverrouillée à la fois.",
-  "36213": "",
-  "77260": "Augmente les chances de Critiques de +{value:(stat/10)}%.",
+  "36213": "Résist. Physique",
+  "77260": "+20% de résist. Physique.",
   "1396": "",
   "97425": "Augmente les chances de Critiques de +{value:(stat/10)}%.",
   "77480": "",
   "37140": "Augmente les chances de Critiques de +{value:(stat/10)}%.",
   "67325": "",
-  "55090": "Augmente les dégâts Critiques de +{value:stat}%.",
+  "55090": "Augmente les dégâts Critiques de +{value:(stat/10)}%.",
   "74130": "",
-  "35453": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:dmg}%.",
+  "35453": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:(dmg/10)}%.",
   "40008": "",
-  "78868": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:dmg}%.",
+  "78868": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:(dmg/10)}%.",
   "76356": "",
-  "77568": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:dmg}%.",
-  "74906": ""
+  "77568": "Augmente les chances de Critiques de +{value:(chance/10)}%.\nAugmente les dégâts Critiques de +{value:(dmg/10)}%.",
+  "74906": "Spécial Kamas",
+  "98456": "+1% au Drop de Kamas.",
+  "96435": "Vitalité",
+  "13176": "+1% aux {%pv} max.",
+  "70953": "Vitalité",
+  "35806": "+2% aux {%pv} max.",
+  "96002": "Vitalité",
+  "77876": "+3% aux {%pv} max.",
+  "98516": "Vitalité",
+  "28071": "+5% aux {%pv} max.",
+  "68427": "Résist. Physique",
+  "70217": "+10% de résist. Physique.",
+  "25863": "Résist. Physique",
+  "39400": "+30% de résist. Physique.",
+  "83117": "Résist. Physique",
+  "90559": "+50% de résist. Physique.",
+  "53248": "Résist. Magique",
+  "31822": "+10% de résist. Magique.",
+  "28207": "Résist. Magique",
+  "28885": "+20% de résist. Magique.",
+  "57380": "Résist. Magique",
+  "43581": "+30% de résist. Magique.",
+  "97863": "Résist. Magique",
+  "9808": "+50% de résist. Magique.",
+  "5745": "Dégâts d\u0027Arme",
+  "92103": "+1% aux dégâts Physiques.",
+  "897": "Dégâts d\u0027Arme",
+  "70816": "+2% aux dégâts Physiques.",
+  "6055": "Dégâts d\u0027Arme",
+  "42128": "+3% aux dégâts Physiques.",
+  "24021": "Dégâts d\u0027Arme",
+  "83041": "+5% aux dégâts Physiques.",
+  "76290": "CC d\u0027Arme",
+  "72071": "+10% aux CC Physiques.",
+  "86473": "CC d\u0027Arme",
+  "42079": "+20% aux CC Physiques.",
+  "55461": "CC d\u0027Arme",
+  "45525": "+30% aux CC Physiques.",
+  "55580": "CC d\u0027Arme",
+  "94423": "+50% aux CC Physiques.",
+  "66581": "Dégâts CC d\u0027Arme",
+  "67293": "+4% aux dégâts CC Physiques.",
+  "12538": "Dégâts CC d\u0027Arme",
+  "53142": "+8% aux dégâts CC Physiques.",
+  "59663": "Dégâts CC d\u0027Arme",
+  "94919": "+12% aux dégâts CC Physiques.",
+  "2208": "Dégâts CC d\u0027Arme",
+  "76874": "+20% aux dégâts CC Physiques.",
+  "59544": "Dégâts des Sorts",
+  "59410": "+1% aux dégâts Magiques.",
+  "83644": "Dégâts des Sorts",
+  "87359": "+2% aux dégâts Magiques.",
+  "79575": "Dégâts des Sorts",
+  "42659": "+3% aux dégâts Magiques.",
+  "29237": "Dégâts des Sorts",
+  "29885": "+5% aux dégâts Magiques.",
+  "8970": "CC des Sorts",
+  "41273": "+10% aux CC Magiques.",
+  "14868": "CC des Sorts",
+  "10545": "+20% aux CC Magiques.",
+  "86611": "CC des Sorts",
+  "74268": "+30% aux CC Magiques.",
+  "43923": "CC des Sorts",
+  "99239": "+50% aux CC Magiques.",
+  "48383": "Dégâts CC des Sorts",
+  "87939": "+4% aux dégâts CC Magiques.",
+  "35751": "Dégâts CC des Sorts",
+  "60930": "+8% aux dégâts CC Magiques.",
+  "82288": "Dégâts CC des Sorts",
+  "20796": "+12% aux dégâts CC Magiques.",
+  "7179": "Dégâts CC des Sorts",
+  "36199": "+20% aux dégâts CC Magiques.",
+  "67981": "Sagesse",
+  "10649": "+1% au gain d\u0027Expérience.",
+  "4993": "Sagesse",
+  "75712": "+2% au gain d\u0027Expérience.",
+  "15899": "Sagesse",
+  "40753": "+3% au gain d\u0027Expérience.",
+  "22499": "Sagesse",
+  "72551": "+5% au gain d\u0027Expérience.",
+  "75090": "Spécial Objets",
+  "29231": "+1% au Drop d\u0027Objets.",
+  "17683": "Spécial Objets",
+  "76794": "+2% au Drop d\u0027Objets.",
+  "57965": "Spécial Objets",
+  "2456": "+3% au Drop d\u0027Objets.",
+  "28544": "Spécial Objets",
+  "74554": "+5% au Drop d\u0027Objets.",
+  "7928": "Spécial Kamas",
+  "31362": "+2% au Drop de Kamas.",
+  "28854": "Spécial Kamas",
+  "33882": "+3% au Drop de Kamas.",
+  "78784": "Spécial Kamas",
+  "91121": "+5% au Drop de Kamas.",
+  "42593": "",
+  "8848": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 3% par niveau)",
+  "4869": "",
+  "57790": "+50% aux dégâts de \u003cb\u003eCOLLISON\u003c/b\u003e.",
+  "25391": "",
+  "96049": "+{value:ppow}% aux dégâts physiques.\n(+ 0.3% par niveau)",
+  "18972": "",
+  "1665": "blabla",
+  "48966": "",
+  "41605": "blabla",
+  "45100": "",
+  "3129": "blabla",
+  "43602": "",
+  "37424": "",
+  "41621": "",
+  "71203": "+{value:xp}% aux gains d\u0027expérience sur les monstres.\n(+ 0.1% par niveau)",
+  "65136": "Voyageur Serein",
+  "14471": "Quand votre héros se téléporte sur une case sans adversaire autour\\_\u003csprite name\u003dcell_around/\u003e, il se soigne de {healAndNext:pv}.",
+  "31197": "Voyageur Prévoyant",
+  "30363": "Quand votre héros se téléporte autour\\_\u003csprite name\u003dcell_around/\u003e d’un \u003cb\u003eMÉCANISME\u003c/b\u003e allié, il gagne {blindageAndNext:bl}.",
+  "5037": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Votre héros gagne +{valueAndNext:buffP}% aux dégâts physiques par case entre lui et l\u0027adversaire le plus proche pour le tour.",
+  "23588": "Voyageur Précis",
+  "92": "Quand votre héros se téléporte\\_: il déclenche {explosionAndNext:dmg} sur sa case de départ.",
+  "94089": "Voyageur Incandescent",
+  "7111": "Quand vous jouez un sort sur un adversaire à {cell:c} ou moins de votre héros, il gagne +{valueAndNext:dmg}% aux dégâts physiques pour le tour.",
+  "30705": "Posture du Feu",
+  "70937": "Quand vous jouez un sort coûtant au moins {value:c}\\_{%PA}, {valueAndNext:(perc/10)}% de chance d\u0027ajouter {addReserve:pa}.",
+  "92476": "Posture de l\u0027Eau",
+  "21431": "Quand vous achevez un adversaire à au moins {cell:c} de votre héros, il gagne {armorAndNext:ar}.",
+  "84815": "Posture de la Terre",
+  "85287": "Quand vous jouez {value:s}\\_sorts dans le tour\\_: vous gagnez +{valueAndNext:dmg}% aux dégâts magiques jusqu\u0027au prochain sort joué.",
+  "82020": "Posture de l\u0027Air",
+  "36162": "Bonus d\u0027Expérience",
+  "34094": "",
+  "28742": "{Summoning:392} commence le combat avec {value:mf}\\_{#MUSCLEDFIST[POINGS MUSCLÉS]}.",
+  "5844": "",
+  "31142": "Les effets de cet anneau ont 50% de chance de se déclencher quand votre {#WAKFU} est au moins niveau {value:lvl}.",
+  "47258": "",
+  "68682": "",
+  "90124": "",
+  "82702": "",
+  "51338": "",
+  "34494": "",
+  "41513": "",
+  "28363": "Si un SFERATU applique un \u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e, il soigne votre héros de 50% de ses PV max.",
+  "78197": "",
+  "48452": "",
+  "47416": "",
+  "51255": "",
+  "6509": "",
+  "275778": "",
+  "97071": "",
+  "20728": "",
+  "40858": "",
+  "75539": "",
+  "91023": "+{value:pp}% aux dégâts physiques par \u003cb\u003eAURA\u003c/b\u003e possédée.",
+  "20503": "",
+  "42814": "Tant que votre héros a de l’{%AR}\\_:\\v il gagne +{value:(mres/10)}% de résistance magique.",
+  "65612": "",
+  "96098": "",
+  "14624": "",
+  "45906": "L\u0027attaque de votre héros {#LIFESTEAL[VOLE LA VIE]} si vous avez au moins {value:w}\\_jauges EAU\u003csprite name\u003dwater/\u003e.",
+  "78823": "",
+  "54363": "La première fois que tous les ennemis sont blessés, {Summoning:36} gagne {armor:value}.",
+  "51347": "",
+  "85529": "",
+  "41022": "",
+  "70371": "",
+  "70115": "",
+  "5646": "+{value:mp}% aux dégats magiques par \u003cb\u003eAURA\u003c/b\u003e possédée.",
+  "17889": "",
+  "37585": "Tant que {Summoning:36}\\_est\\_en jeu\\_:\\v vous avez +1\\_{%PA}.​",
+  "91033": "",
+  "87946": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: +{armor:ar} par niveau de votre héros.",
+  "20775": "",
+  "95858": "Quand un compagnon allié gagne de l’{%AR}\\_:\\v Votre héros en gagne autant.",
+  "83187": "",
+  "13761": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {value:(perc/10)}% de chance de gagner {armor:ar}.",
+  "96225": "",
+  "10912": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_:\\v {value:(perc/10)}% de chance d’en gagner une du même type.\n(1 fois par tour).",
+  "80263": "",
+  "72181": "Quand vous jouez un sort donnant de l’{%AR}\\_:\\v {value:(perc/10)}% de chance d\u0027ajouter {addReserve:pa}",
+  "52533": "",
+  "94141": "Quand {Summoning:36} meurt\\_:\\v soigne votre héros du montant de son {%AT}.",
+  "4672": "",
+  "23459": "{Summoning:196} gagne 1 {%pm}.",
+  "20362": "",
+  "7890": "Votre {Summoning:196} gagne +0.5% {%at} par niveau de votre héros.",
+  "54405": "",
+  "69570": "Les effets de cet anneau ont {value:rng}% de chance de se déclencher à nouveau.",
+  "10567": "",
+  "70466": "",
+  "52230": "",
+  "85980": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {value:(rng/10)}% de chance d\u0027infliger les dégâts aux adversaires autour\\_\u003csprite name\u003dcell_around/\u003e de la cible.",
+  "44298": "",
+  "44858": "\u003cb\u003eATTAQUE\u003c/b\u003e : {value:(rng/10)}% de chance d\u0027ajouter {addReserve:x}.",
+  "85885": "",
+  "47721": "+{value:A} aux dégâts de {#FROZEN}.",
+  "68306": "",
+  "94876": "15% de chance d\u0027ajouter {addFire:af} lorsque vous appliquez l\u0027étatt \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003dfire\u003e.",
+  "91082": "",
+  "93047": "Quand vous appliquez {#Frozen}\\_:\\v {value:(perc/10)}% de chance d\u0027ajouter {addReserve:pa}.",
+  "96575": "",
+  "23713": "Quand vous déclenchez {#BOUNCE}\\_:\\v Ajoute {addReserve:pa}.",
+  "94645": "",
+  "37787": "Quand un compagnon EAU\u003csprite name\u003dwater/\u003e allié meurt\\_:\\v applique {frozen:PropertyEffect.26.FrozenDmg} à un adversaire aléatoire.",
+  "36666": "",
+  "58371": "15% de chance d\u0027ajouter {addWater:aw} quand vous appliquez l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
+  "74576": "",
+  "85125": "Quand un de vos compagnons FEU\u003csprite name\u003dfire/\u003e meurt\\_:\\v applique \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003dfire\u003e à l\u0027adversaire ayant le plus de {%PV}.",
+  "32567": "",
+  "40779": "{value:(perc/10)}% de chance que votre héros déclenche {explosion:ex} quand vous gagnez 1 jauge FEU\u003csprite name\u003dfire/\u003e.",
+  "44660": "",
+  "31334": "Quand vous appliquez {#STUN}\\_:\\v {value:(perc/10)}% de chance d\u0027ajouter {addReserve:pa}.",
+  "42445": "",
+  "8028": "Quand votre héros \u003cb\u003echarge\u003c/b\u003e une cible ayant l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e\\_: applique {#STUN}.",
+  "35993": "",
+  "11574": "Vos compagnons EAU\u003csprite name\u003dwater/\u003e gagnent {value:at}% d\u0027{%AT}.",
+  "31914": "",
+  "12279": "Quand une {#EXPLOSION} est déclenchée\\_:\\v Votre héros gagne +{value:p}% de dégâts physiques pour le tour.",
+  "22755": "",
+  "8231": "Quand vous appliquez {#STUN}\\_:\\v Ajoute {addEarth:ae}.",
+  "54464": "",
+  "97339": "Vos compagnons FEU\u003csprite name\u003dfire/\u003e gagnent 10% {%PV} MAX.",
+  "45058": "",
+  "68248": "",
+  "23579": "",
+  "87956": "+50% aux dégâts d\u0027{#EXPLOSION}.",
+  "7698": "",
+  "52855": "",
+  "60858": "Quand un de vos sorts applique {#FROZEN}\\_:\\v {value:(pgel/10)}% de chance qu\u0027il revienne dans votre main.",
+  "51267": "",
+  "46953": "Quand vous appliquez l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e\\_:\\v Ajoute {addReserve:pa}.",
+  "78857": "",
+  "77092": "Votre {Summoning:392} gagne +0.5% {%at} par niveau de votre héros.",
+  "47104": "",
+  "13716": "{Summoning:553} vole 1\\_{%PM} aux adversaires qu\u0027il traverse.",
+  "89040": "",
+  "50684": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e ⣬à l\u0027adversaire ayant le plus de {%pv}.",
+  "24171": "",
+  "10072": "{Summoning:392} gagne +{value:(RingEquipment.396.CCP/10)}% de chances de critiques physiques.",
+  "91835": "",
+  "1477": "Votre héros gagne +{value:dbuff}% de dégâts physiques par adversaire ayant l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
+  "4803": "",
+  "61877": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: {value:(pmud/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e aux adversaires.",
+  "27418": "",
+  "97520": "Votre {Summoning:392} gagne +0.5%\\_{%PV} par niveau de votre héros.",
+  "8939": "",
+  "92693": "",
+  "17790": "",
+  "899": "",
+  "89089": "Quand vous appliquez {#FROZEN}\\_:\\v Ajoute {addWater:ae}.",
+  "67679": "",
+  "55287": "Quand vous déclenchez {#BOUNCE}\\_:\\v {value:(perc/10)}% de chance d\u0027ajouter {addReserve:pa}.",
+  "37280": "",
+  "51573": "Quand vous appliquez {#FROZEN}\\_:\\v Ajoute {addReserve:pa}.",
+  "93585": "",
+  "23974": "Vos compagnons FEU\u003csprite name\u003dfire/\u003e gagnent 10% {%AT}.",
+  "66155": "",
+  "26454": "Vos compagnons EAU\u003csprite name\u003dwater/\u003e gagnent +{value:pv} de {%PV} MAX.",
+  "38081": "",
+  "96997": "Quand vous déclenchez {#BOUNCE}\\_:\\v Ajoute {addAir:aa}.",
+  "18487": "",
+  "7576": "15% de chance que vos sorts déclenchant {#EXPLOSION} reviennent dans votre main.\n\\---\n\u003ci\u003eCe pouvoir se cumule sur 2 anneaux.\u003c/i\u003e",
+  "806": "",
+  "99956": "Quand vous appliquez {#STUN}\\_:\\v Confère +{armor:ar} à votre héros.",
+  "27525": "",
+  "99289": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e à l\u0027adversaire ayant le plus de {%pv}.",
+  "86294": "",
+  "62294": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: {value:(pvent/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e aux adversaires.",
+  "14045": "",
+  "56856": "Quand {Summoning:553} meurt\\_:\\v vous gagnez +{mp}% aux dégâts magiques.",
+  "62295": "",
+  "32594": "{Summoning:553} se soigne de {value:h}\\_{%PV} quand il traverse un adversaire.",
+  "45431": "",
+  "72554": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e à l\u0027adversaire ayant le plus de {%pv}.",
+  "4045": "",
+  "72320": "{Summoning:553} applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet/\u003e aux adversaires qu\u0027il traverse.",
+  "22840": "",
+  "91455": "Quand un compagnon \u003cb\u003eEAU\u003c/b\u003e\u003csprite name\u003dwater\u003e allié meurt\\_:\\v applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "11826": "",
+  "56577": "Votre {Summoning:196} gagne +0.5% de {%pv} par niveau de votre héros.",
+  "69814": "",
+  "16713": "Quand {Summoning:196} achève un adversaire\\_:\\v il se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross/\u003e à l\u0027adversaire ayant le moins de {%pv} et déclenche une attaque.",
+  "10659": "",
+  "38843": "",
+  "74733": "",
+  "37251": "",
+  "87354": "",
+  "68027": "Si 2 effets de cet anneau se déclenchent dans le tour\\_: votre héros rejoue son tour.",
+  "32297": "",
+  "44702": "",
+  "665": "",
+  "88451": "",
+  "12596": "",
+  "72348": "{Summoning:553} gagne +0.5%\\_{%PV} par niveau de votre héros.",
+  "23438": "",
+  "88929": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: +{value:wak} Niveaux de {#WAKFU}.",
+  "58243": "",
+  "69442": "Quand vous appliquez l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e\\_:\\v {value:(pboost/10)}% de chance d\u0027ajouter {addWater:watup}.",
+  "7302": "",
+  "124": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e à l\u0027adversaire ayant le plus de {%pv}.",
+  "25571": "",
+  "30001": "{Summoning:392} gagne +{value:(RingEquipment.396.DCCP/10)}% de dégâts critiques physiques.",
+  "93574": "",
+  "22983": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: +{value:sta} Niveaux de {#STASIS}.",
+  "66504": "",
+  "64677": "Quand votre héros attaque l\u0027adversaire ayant la plus haute {%AT}\\_: {value:(patk/10)}% de chance que {Summoning:392} se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à la cible et déclenche une attaque.",
+  "29697": "",
+  "20739": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: {value:(pwet/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e aux adversaires.",
+  "81991": "",
+  "70488": "Quand vous utilisez votre {%reserve}\\_:\\v Réduit le coût du prochain sort de {value:(-pa)}\\_{%pa}.\n\\---\n({value:turn} fois par tour)",
+  "56253": "",
+  "48714": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {value:(rng/10)}% de chance d\u0027ajouter {addNeutral:x}.",
+  "76245": "",
+  "10765": "",
+  "276400": "",
+  "82193": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Vous gagnez +{value:dmgM}% de dégâts magiques pour le tour si un adversaire se trouve autour\\_\u003csprite name\u003dcell_around/\u003e de {Summoning:196}.",
+  "41820": "",
+  "16508": "{value:(rng/10)}% de chances de déclencher l\u0027apparition d\u0027un nouveau SFERATU.",
+  "33313": "",
+  "51011": "",
+  "97257": "",
+  "59852": "",
+  "6677": "",
+  "65458": "Lance {value:c}\\_\u003cb\u003eÉTINCELLES MAGIQUES\u003c/b\u003e supplémentaires.",
+  "31277": "",
+  "42452": "Votre {Summoning:36} gagne 0.5% de {%PV} par niveau de votre héros.",
+  "58582": "",
+  "66384": "",
+  "34677": "",
+  "65568": "Votre\\_{Summoning:36}\\_gagne 0.5%\\_d\u0027{%aT} par niveau de votre\\_héros.",
+  "94317": "",
+  "77956": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: +{value:value}\\_Niveaux de\\_{#STASIS}.",
+  "17840": "",
+  "60978": "",
+  "64876": "",
+  "31995": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: +{value:value}\\_Niveaux de\\_{#WAKFU}.",
+  "51163": "",
+  "338": "",
+  "3466": "",
+  "19569": "Quand {Summoning:36} meurt\\_:\\v Ajoute {addNeutral:x}.",
+  "2802": "",
+  "86145": "",
+  "17705": "",
+  "76047": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_:\\v {value:(perc/10)}% de chance d\u0027infliger {magicalDamage:dmg} à un adversaire aléatoire.",
+  "59347": "",
+  "65938": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Confère {armor:ar} par adversaire autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.",
+  "42645": "",
+  "66959": "\u003cb\u003eDÉBUT DE COMBAT\u003c/b\u003e\\_: Converti {value:perc}% de votre {%AR}\\v en % de dégâts physiques.",
+  "97308": "",
+  "82565": "+{value:dmg}% de dégâts à vos \u003cb\u003eAURA\u003c/b\u003e.",
+  "19220": "",
+  "68605": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: {value:(proba/10)}% de chance d\u0027ajouter {addWater:value}.",
+  "32599": "",
+  "19020": "Les compagnons EAU\u003csprite name\u003dwater/\u003e alliés gagnent +{value:valueA}% {%at}.",
+  "10759": "",
+  "55253": "Quand vous invoquez un compagnon EAU\u003csprite name\u003dwater/\u003e\\_:\\v vous gagnez +{value:valueA}% de dégâts magiques par point de jauge dépensé pour le tour.",
+  "7435": "",
+  "15578": "",
+  "99538": "",
+  "25277": "\u003cb\u003eCOUP DE GRÂCE :\u003c/b\u003e Votre héros déclenche {explosion:ex}.",
+  "83341": "",
+  "56568": "Quand {Summoning:196} meurt\\_:\\v Applique l\u0027état {#ASTRAL} aux adversaires.",
+  "21346": "",
+  "17772": "",
+  "14595": "",
+  "80820": "Quand vous déclenchez une {#EXPLOSION}\\_:\\v {value:(perc/10)}% de chance d\u0027ajouter {addFire:af}.",
+  "37260": "",
+  "55343": "Quand un compagnon EAU\u003csprite name\u003dwater/\u003e allié meurt\\_:\\v Ajoute {addWater:value}.",
+  "74852": "",
+  "57411": "{value:(proba/10)}% de chance d\u0027ajouter {addWater:value} quand vous appliquez l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet/\u003e.",
+  "2921": "",
+  "42611": "Les compagnons EAU\u003csprite name\u003dwater/\u003e alliés gagnent +10%\\_{%PV} max.",
+  "41142": "",
+  "6097": "Un autre SFERATU inflige {value:dmg} dégâts à un personnage aléatoire.",
+  "79852": "",
+  "41599": "Quand un de vos compagnon EAU\u003csprite name\u003dwater/\u003e meurt\\_:\\v applique {#FROZEN[GELÉ]} à l\u0027adversaire ayant le plus de {%PV}.",
+  "7283": "",
+  "97430": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e\\_: {value:(poil/10)}% de chance d\u0027appliquer l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e aux adversaires.",
+  "71713": "",
+  "56092": "Quand votre héros gagne une \u003cb\u003eAURA\u003c/b\u003e\\_\nalors qu\u0027il n\u0027en a pas :\\v {value:(perc/10)}% de chance d’en gagner une supplémentaire.",
+  "53174": "",
+  "24972": "",
+  "86479": "",
+  "63024": "{Summoning:553} gagne +0.5% {%at} par niveau de votre héros.",
+  "78026": "",
+  "19414": "",
+  "85188": "",
+  "49854": "",
+  "62854": "",
+  "4448": "Quand votré héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_:\\v Ajoute +{value:sta} à votre niveau de {#STASIS}.",
+  "35702": "",
+  "42822": "15% de chance que vos sorts appliquant {#FROZEN} reviennent dans votre main.",
+  "32074": "",
+  "47636": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +{armor:ar} par niveau de votre héros.",
+  "96543": "",
+  "94471": "Quand vous appliquez l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e\\_:\\v {value:(pboost/10)}% de chance d\u0027ajouter {addEarth:earup}.",
+  "6359": "",
+  "54184": "Quand vous appliquez l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e\\_:\\v {value:(pboost/10)}% de chance d\u0027ajouter {addFire:firup}.",
+  "85020": "",
+  "1493": "Quand vous appliquez l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e\\_:\\v {value:(pboost/10)}% de chance d\u0027ajouter {addAir:airup}.",
+  "64821": "",
+  "73422": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 1% par niveau)",
+  "31551": "",
+  "71640": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 1.2% par niveau)",
+  "32994": "",
+  "65749": "+{value:k}% de kamas obtenus sur les monstres.\n(+ 0.2% par niveau)",
+  "72429": "",
+  "16270": "+{value:hb}% aux soins.\n(+ 0.3% par niveau)",
+  "36508": "",
+  "14477": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 0.8% par niveau)",
+  "87555": "",
+  "45968": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 0.8% par niveau)",
+  "65952": "",
+  "66205": "+{value:k}% de kamas obtenus sur les monstres.\n(+ 0.1% par niveau)",
+  "89409": "",
+  "48939": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 0.4% par niveau)",
+  "90292": "",
+  "4358": "+{value:col}% aux dégâts de collision.\n(+ 0.3% par niveau)",
+  "84662": "",
+  "38500": "+{value:hb}% aux soins.\n(+ 0.3% par niveau)",
+  "3604": "",
+  "52435": "+{value:hpb}% aux {%pv} max.",
+  "61585": "",
+  "15597": "+{value:hpb}% aux {%pv} max.\n(+ 0.2% par niveau)",
+  "91563": "",
+  "62583": "+{value:k}% de kamas obtenus sur les monstres.",
+  "59025": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 0.4% par niveau)",
+  "50702": "",
+  "54733": "+{value:(dccp/10)}% aux dégâts critiques physiques.",
+  "66807": "",
+  "48172": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 3% par niveau)",
+  "92441": "",
+  "13180": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 3% par niveau)",
+  "86453": "",
+  "92286": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 2% par niveau)",
+  "28779": "",
+  "70726": "+{value:xp}% aux gains d\u0027expérience sur les monstres.",
+  "22184": "",
+  "6873": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 1% par niveau)",
+  "35755": "",
+  "12927": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.1% par niveau)",
+  "33061": "",
+  "60805": "+{value:ex}% aux dégâts d\u0027explosion.",
+  "475": "",
+  "22783": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 1.2% par niveau)",
+  "16507": "",
+  "65110": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 1.2% par niveau)",
+  "23030": "",
+  "59004": "+{value:hb}% aux soins.\n(+ 0.2% par niveau)",
+  "8238": "",
+  "27984": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 3% par niveau)",
+  "51370": "",
+  "22837": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 1.2% par niveau)",
+  "94246": "",
+  "83391": "+{value:mpow}% aux dégâts magiques.\n(+ 0.3% par niveau)",
+  "64135": "",
+  "32430": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 1.2% par niveau)",
+  "5465": "",
+  "98576": "+{value:mpow}% aux dégâts magiques.\n(+ 0.2% par niveau)",
+  "70998": "",
+  "46491": "+{value:mpow}% aux dégâts magiques.\n(+ 0.1% par niveau)",
+  "38513": "",
+  "87773": "+{value:(mres/10)}% de résistance magique.",
+  "28162": "",
+  "70013": "+{value:mpow}% aux dégâts magiques.",
+  "9869": "",
+  "37111": "+{value:ppow}% aux dégâts physiques.\n(+ 0.3% par niveau)",
+  "92040": "",
+  "949": "+{value:ppow}% aux dégâts physiques.\n(+ 0.1% par niveau)",
+  "49765": "",
+  "29422": "+{value:ppow}% aux dégâts physiques.\n(+ 0.1% par niveau)",
+  "99158": "",
+  "95362": "+{value:ppow}% aux dégâts physiques.",
+  "18038": "",
+  "56463": "+{value:mpow}% aux dégâts magiques.\n(+ 0.1% par niveau)",
+  "25881": "",
+  "76904": "+{value:gel}% aux dégâts de gel.\n(+ 0.3% par niveau)",
+  "14310": "",
+  "97382": "+{value:hb}% aux soins.\n(+ 0.1% par niveau)",
+  "50634": "",
+  "15800": "+{value:xp}% aux gains d\u0027expérience sur les monstres.",
+  "20790": "",
+  "23949": "+{value:(mres/10)}% de résistance magique.\n(+ 1% par niveau)",
+  "12988": "",
+  "44901": "+{value:(pres/10)}% de résistance physique.\n(+ 1% par niveau)",
+  "38123": "",
+  "8462": "+{value:ppow}% aux dégâts physiques.",
+  "97833": "",
+  "18712": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 1% par niveau)",
+  "95959": "",
+  "45744": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.3% par niveau)",
+  "95839": "",
+  "72500": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 0.8% par niveau)",
+  "18587": "",
+  "31607": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 0.4% par niveau)",
+  "29639": "",
+  "87588": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 0.4% par niveau)",
+  "80220": "",
+  "11398": "+{value:xp}% aux gains d\u0027expérience sur les monstres.\n(+ 0.2% par niveau)",
+  "12799": "",
+  "23787": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.",
+  "86996": "",
+  "86191": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 2% par niveau)",
+  "23849": "",
+  "84986": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 2% par niveau)",
+  "7721": "",
+  "93750": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 3% par niveau)",
+  "54262": "",
+  "6517": "+{value:xp}% aux gains d\u0027expérience sur les monstres.\n(+ 0.1% par niveau)",
+  "68377": "",
+  "55392": "+{value:loot}% de chance d\u0027obtenir des gemmes ou des anneaux sur les monstres.\n(+ 0.1% par niveau)",
+  "32033": "",
+  "85193": "+{value:hpb}% aux {%pv} max.\n(+ 0.3% par niveau)",
+  "60860": "stat pv 50",
+  "35852": "+{value:hpb}% aux {%pv} max.\n(+ 0.3% par niveau)",
+  "95445": "",
+  "80223": "+{value:hpb}% aux {%pv} max.\n(+ 0.3% par niveau)",
+  "81349": "",
+  "58579": "+{value:hpb}% aux {%pv} max.\n(+ 0.2% par niveau)",
+  "38834": "",
+  "78": "+{value:hpb}% aux {%pv} max.\n(+ 0.1% par niveau)",
+  "2909": "",
+  "45675": "+{value:hpb}% aux {%pv} max.\n(+ 0.1% par niveau)",
+  "17578": "",
+  "45939": "+{value:gel}% aux dégâts de gel.\n(+ 0.3% par niveau)",
+  "39277": "",
+  "84762": "+{value:col}% aux dégâts de collision.\n(+ 0.1% par niveau)",
+  "32291": "",
+  "26050": "+{value:col}% aux dégâts de collision.\n(+ 0.1% par niveau)",
+  "64427": "",
+  "70848": "+{value:k}% de kamas obtenus sur les monstres.\n(+ 0.1% par niveau)",
+  "88688": "",
+  "90432": "+{value:(pres/10)}% de résistance physique.\n(+ 2% par niveau)",
+  "76537": "",
+  "85330": "+{value:col}% aux dégâts de collision.\n(+ 0.3% par niveau)",
+  "99773": "",
+  "11608": "+{value:gel}% aux dégâts de gel.\n(+ 0.3% par niveau)",
+  "36844": "",
+  "43175": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.",
+  "5031": "",
+  "29450": "+{value:(dccp/10)}% aux dégâts critiques physiques.",
+  "31829": "",
+  "47929": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.1% par niveau)",
+  "18292": "",
+  "27114": "+{value:(mres/10)}% de résistance magique.\n(+ 2% par niveau)",
+  "16902": "",
+  "71901": "+{value:col}% aux dégâts de collision.\n(+ 0.2% par niveau)",
+  "39867": "",
+  "27421": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.2% par niveau)",
+  "35446": "",
+  "70967": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.",
+  "35891": "",
+  "21010": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.",
+  "68046": "",
+  "91086": "+{value:ppow}% aux dégâts physiques.\n(+ 0.2% par niveau)",
+  "43263": "",
+  "25325": "+{value:ppow}% aux dégâts physiques.\n(+ 0.2% par niveau)",
+  "68257": "",
+  "75171": "+{value:ppow}% aux dégâts physiques.\n(+ 0.3% par niveau)",
+  "55834": "",
+  "2007": "+{value:mpow}% aux dégâts magiques.",
+  "4019": "",
+  "79007": "+{value:mpow}% aux dégâts magiques.\n(+ 0.2% par niveau)",
+  "71521": "",
+  "91085": "+{value:(mres/10)}% de résistance magique.\n(+ 1% par niveau)",
+  "74059": "",
+  "55067": "+{value:(pres/10)}% de résistance physique.",
+  "30290": "",
+  "94407": "+{value:(pres/10)}% de résistance physique.",
+  "54452": "",
+  "15242": "+{value:(pres/10)}% de résistance physique.\n(+ 1% par niveau)",
+  "78140": "",
+  "23996": "+{value:mpow}% aux dégâts magiques.\n(+ 0.3% par niveau)",
+  "28167": "",
+  "90621": "+{value:mpow}% aux dégâts magiques.\n(+ 0.3% par niveau)",
+  "71916": "",
+  "48573": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.2% par niveau)",
+  "49334": "",
+  "35138": "+{value:gel}% aux dégâts de gel.\n(+ 0.1% par niveau)",
+  "93255": "",
+  "16166": "+{value:gel}% aux dégâts de gel.\n(+ 0.1% par niveau)",
+  "73109": "",
+  "18629": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.3% par niveau)",
+  "44917": "",
+  "85642": "+{value:(mres/10)}% de résistance magique.",
+  "33040": "",
+  "98953": "+{value:gel}% aux dégâts de gel.",
+  "21402": "",
+  "53541": "+{value:ex}% aux dégâts d\u0027explosion.\n(+ 0.3% par niveau)",
+  "39520": "",
+  "67467": "+{value:hb}% aux soins.\n(+ 0.2% par niveau)",
+  "13770": "",
+  "3167": "+{value:hb}% aux soins.\n(+ 0.3% par niveau)",
+  "59116": "",
+  "96791": "+{value:loot}% de chance d\u0027obtenir des gemmes ou des anneaux sur les monstres.",
+  "11311": "",
+  "34707": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 2% par niveau)",
+  "15098": "",
+  "68358": "+{value:loot}% de chance d\u0027obtenir des gemmes ou des anneaux sur les monstres.",
+  "26582": "",
+  "868": "+{value:hb}% aux soins.\n(+ 0.1% par niveau)",
+  "331": "",
+  "71744": "+{value:(dccm/10)}% aux dégâts critiques magiques.",
+  "27821": "",
+  "54430": "+{value:gel}% aux dégâts de gel.\n(+ 0.2% par niveau)",
+  "29037": "",
+  "48942": "+{value:col}% aux dégâts de collision.\n(+ 0.2% par niveau)",
+  "50132": "",
+  "91583": "+{value:(dccm/10)}% aux dégâts critiques magiques.",
+  "93377": "",
+  "83081": "+{value:gel}% aux dégâts de gel.\n(+ 0.2% par niveau)",
+  "54308": "",
+  "89872": "+{value:(dccp/10)}% aux dégâts critiques physiques.\n(+ 1.2% par niveau)",
+  "21905": "",
+  "95742": "+{value:col}% aux dégâts de collision.\n(+ 0.3% par niveau)",
+  "94831": "",
+  "46517": "+{value:(dccm/10)}% aux dégâts critiques magiques.\n(+ 0.8% par niveau)",
+  "66129": "",
+  "76247": "+{value:col}% aux dégâts de collision.",
+  "91742": "",
+  "20348": "+{value:(ccp/10)}% de chance d\u0027effectuer des critiques physiques.\n(+ 3% par niveau)",
+  "87504": "",
+  "30226": "+{value:(ccm/10)}% de chance d\u0027effectuer des critiques magiques.\n(+ 1% par niveau)",
+  "12780": "",
+  "18021": "+{value:hb}% aux soins.",
+  "74953": "",
+  "12141": "+{value:hpb}% aux {%pv} max.",
+  "54013": "",
+  "41313": "+{value:loot}% de chance d\u0027obtenir des gemmes ou des anneaux sur les monstres.\n(+ 0.1% par niveau)",
+  "8419": "",
+  "29930": "+{value:loot}% de chance d\u0027obtenir des gemmes ou des anneaux sur les monstres.\n(+ 0.2% par niveau)",
+  "37597": "",
+  "38795": "+{value:(mres/10)}% de résistance magique.\n(+ 2% par niveau)",
+  "63505": "",
+  "17393": "+{value:(mres/10)}% de résistance magique.\n(+ 3% par niveau)",
+  "56587": "",
+  "9377": "+{value:(mres/10)}% de résistance magique.\n(+ 3% par niveau)",
+  "22472": "",
+  "47582": "+{value:(mres/10)}% de résistance magique.\n(+ 3% par niveau)",
+  "11564": "",
+  "17523": "+{value:(pres/10)}% de résistance physique.\n(+ 2% par niveau)",
+  "50425": "",
+  "55778": "+{value:(pres/10)}% de résistance physique.\n(+3% par niveau)",
+  "99874": "",
+  "92417": "+{value:(pres/10)}% de résistance physique.\n(+ 3% par niveau)",
+  "63035": "",
+  "65304": "+{value:(pres/10)}% de résistance physique.\n(+ 3% par niveau)",
+  "30041": "",
+  "1520": "Quand un compagnon \u003cb\u003eTERRE\u003c/b\u003e\u003csprite name\u003dearth\u003e allié meurt\\_:\\v applique l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "43939": "",
+  "38026": "Quand un compagnon \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e allié meurt\\_:\\v applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "86460": "",
+  "65361": "Quand un compagnon \u003cb\u003eAIR\u003c/b\u003e\u003csprite name\u003dwind\u003e allié meurt\\_:\\v applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "72104": "",
+  "42438": "Votre héros gagne +{value:dbuff}% de dégâts physiques par adversaire ayant l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e.",
+  "25886": "",
+  "82158": "Votre héros gagne +{value:dbuff}% de dégâts physiques par adversaire avec l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.",
+  "43379": "",
+  "21284": "Votre héros gagne +{value:dbuff}% de dégâts physiques par adversaire ayant l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
+  "50754": "",
+  "21830": "Quand un de vos sorts déclenche une {#EXPLOSION}\\_:\\v {value:(pexp/10)}% de chance qu\u0027il revienne dans votre main.",
+  "30583": "",
+  "42140": "Quand un de vos sorts déclenche {#BOUNCE}\\_:\\v {value:(pbce/10)}% de chance qu\u0027il revienne dans votre main.",
+  "53121": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_:\\v {value:(perc/10)}% de chances de d\u0027ajouter {addNeutral:g}.",
+  "55326": "",
+  "12223": "\u003cb\u003eDÉBUT\\_DU\\_COMBAT\u003c/b\u003e\\_: Ajoute {addReserve:r}.",
+  "97297": "",
+  "56205": "Quand vous utilisez votre {%reserve}\\_:\\v Vous gagnez +{value:dmg}% de dégâts magiques jusqu\u0027au prochain sort joué.\n\\---\n(1 fois par tour)",
+  "53602": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Votre héros gagne {#SHIELD}\\v si vous avez au moins {value:t}\\_jauges TERRE\u003csprite name\u003dearth/\u003e.",
+  "72590": "",
+  "4749": "Quand vous invoquez un compagnon TERRE\u003csprite name\u003dearth/\u003e\\_:\\v vous gagnez {value:valueA}% de dégâts magiques par point de jauge dépensé pour le tour.",
+  "46080": "",
+  "32650": "",
+  "19580": "...",
+  "72703": "Quand un compagnon TERRE\u003csprite name\u003dearth/\u003e allié meurt\\_:\\v Ajoute {addEarth:value}.",
+  "35288": "",
+  "32893": "Les compagnons TERRE\u003csprite name\u003dearth/\u003e allié gagnent +{value:valueA}%\\_{%PV} max.",
+  "56449": "",
+  "32451": "Vos compagnons TERRE\u003csprite name\u003dearth/\u003e gagnent +{value:valueA}% {%at}.",
+  "86297": "",
+  "76664": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: {value:(proba/10)}% de chance d\u0027ajouter {addEarth:value}.",
+  "52084": "",
+  "85061": "{value:(proba/10)}% de chance d\u0027ajouter {addEarth:value} quand vous appliquez l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e.",
+  "94069": "",
+  "77493": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Votre héros gagne {#SHIELD} si vous avez au moins {value:a}\\_jauges AIR\u003csprite name\u003dwind/\u003e.",
+  "51070": "",
+  "61616": "Quand vous invoquez un compagnon AIR\u003csprite name\u003dwind/\u003e\\_:\\v vous gagnez {value:valueA}% de dégâts magiques par point de jauge dépensé pour le tour.",
+  "1808": "",
+  "56816": "",
+  "7114": "",
+  "15974": "Quand un compagnon AIR\u003csprite name\u003dwind/\u003e allié meurt\\_:\\v Ajoute {addAir:value}.",
+  "77473": "",
+  "42694": "Les compagnons AIR\u003csprite name\u003dwind/\u003e alliés gagnent +{value:valueA}%\\_{%PV} max.",
+  "78929": "",
+  "44556": "Les compagnons AIR\u003csprite name\u003dwind/\u003e alliés gagnent +{value:valueA}% {%at}.",
+  "47282": "",
+  "28704": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: {value:(proba/10)}% de chance d\u0027ajouter {addAir:value}.",
+  "61165": "",
+  "23305": "{value:(proba/10)}% de chance d\u0027ajouter {addAir:value} quand vous appliquez l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated/\u003e.",
+  "87619": "",
+  "75516": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Votre héros gagne {#SHIELD} si vous avez au moins {value:f}\\_jauges FEU\u003csprite name\u003dfire/\u003e.",
+  "83561": "",
+  "56137": "Quand vous invoquez un compagnon FEU\u003csprite name\u003dfire/\u003e\\_:\\v vous gagnez {value:valueA}% de dégâts magiques par point de jauge dépensé pour le tour.",
+  "10361": "",
+  "62122": "",
+  "97986": "",
+  "68579": "Quand un compagnon FEU\u003csprite name\u003dfire/\u003e allié meurt\\_:\\v Ajoute {addFire:value}.",
+  "34799": "",
+  "45858": "Les compagnons FEU\u003csprite name\u003dfire/\u003e alliés gagnent +{value:valueA}%\\_{%PV} max.",
+  "84359": "",
+  "66108": "Les compagnons FEU\u003csprite name\u003dfire/\u003e alliés gagnent +{value:valueA}% {%at}.",
+  "47699": "",
+  "84511": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: {value:(proba/10)}% de chance d\u0027ajouter {addFire:value}.",
+  "70964": "",
+  "53350": "{value:(proba/10)}% de chances d\u0027ajouter {addFire:value} quand vous appliquez l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled/\u003e.",
+  "21015": "",
+  "14609": "Tant que {Summoning:392} est en jeu\\_:\\v vVotre héros gagne +{value:dmgb}% aux dégâts physiques.",
+  "82975": "",
+  "19806": "",
+  "99738": "Quand vous appliquez {#STUN}\\_:\\v Ajoute {addReserve:pa}.",
+  "56106": "",
+  "26410": "Quand un de vos compagnons TERRE\u003csprite name\u003dearth/\u003e meurt\\_:\\v applique \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e à l\u0027adversaire ayant le plus de {%PV}.",
+  "51268": "Vos compagnons TERRE\u003csprite name\u003dearth/\u003e gagnent {value:pv}% de {%PV} MAX.",
+  "4014": "",
+  "52485": "Vos compagnons TERRE\u003csprite name\u003dearth/\u003e gagnent {value:at}% d\u0027{%AT}.",
+  "53496": "",
+  "33986": "15% de chance que vos sorts appliquant {#STUN} reviennent dans votre main.\n\\---\n\u003ci\u003eCe pouvoir se cumule sur 2 anneaux.\u003c/i\u003e",
+  "28793": "",
+  "50796": "15% de chance d\u0027ajouter {addEarth:ae} quand vous appliquez l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e.",
+  "61488": "",
+  "26684": "+{armor:ar} quand vous prenez une attaque.",
+  "30839": "",
+  "95935": "",
+  "75910": "\u003cb\u003eDÉBUT DU COMBAT\u003c/b\u003e : +{value:dmg}% de dégâts magiques pour le tour.",
+  "85353": "",
+  "72627": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : {value:(rng/10)}% de chance d\u0027ajouter {addReserve:pa}.",
+  "2635": "",
+  "62764": "Quand vous utilisez votre réserve\\_:\\v {value:(rng/10)}% de chance d\u0027ajouter {addReserve:pa}.",
+  "45821": "",
+  "30092": "Si votre {Summoning:392} achève un adversaire\\_:\\v Votre héros gagne +{value:dmgb}% aux dégâts physiques pour le tour.",
+  "36682": "Quand un de vos sorts applique {#STUN}\\_:\\v {value:(pstun/10)}% de chance qu\u0027il revienne dans votre main.",
+  "74914": "",
+  "55273": "",
+  "35056": "",
+  "35099": "",
+  "47584": "",
+  "43699": "",
+  "78997": "",
+  "71000": "",
+  "60533": "",
+  "64962": "",
+  "70231": "",
+  "47312": "",
+  "23976": "",
+  "73077": "",
+  "85722": "",
+  "810": "",
+  "9611": "",
+  "60274": "",
+  "88261": "",
+  "17716": "",
+  "25330": "",
+  "18713": "",
+  "25468": "",
+  "67143": "",
+  "48358": "",
+  "65207": "",
+  "19946": "",
+  "30101": "",
+  "58028": "",
+  "74928": "",
+  "10506": "",
+  "85164": "",
+  "88883": "",
+  "92666": "",
+  "34832": "",
+  "63812": "",
+  "2640": "",
+  "31989": "",
+  "58101": "",
+  "68317": "",
+  "13733": "",
+  "84967": "",
+  "95756": "",
+  "81578": "",
+  "19188": "",
+  "27562": "",
+  "53238": "",
+  "22101": "",
+  "43644": "",
+  "91146": "",
+  "63541": "",
+  "47304": "",
+  "75273": "",
+  "267": "",
+  "70344": "",
+  "62485": "Quand un de vos compagnons AIR\u003csprite name\u003dwind/\u003e meurt\\_: applique \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e à l\u0027adversaire ayant le plus de {%PV}.",
+  "63064": "",
+  "58967": "Vos compagnons AIR\u003csprite name\u003dwind/\u003e gagnent 10% {%PV} MAX.",
+  "12729": "",
+  "69301": "Vos compagnons AIR\u003csprite name\u003dwind/\u003e gagnent 10% {%AT}.",
+  "69143": "",
+  "89809": "15% de chance que vos sorts de {#BOUNCE} reviennent dans votre main.\n\\---\n\u003ci\u003eCe pouvoir se cumule sur 2 anneaux.\u003c/i\u003e",
+  "21137": "",
+  "32659": "15% de chance d\u0027ajouter {addAir:aa} quand vous appliquez l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
+  "51840": "",
+  "79273": "+{armor:ar}% gain d\u0027{%ar}",
+  "28406": "",
+  "68962": "+{value:arb}% aux gains d\u0027{%ar}.\n(+ 0.1% par niveau)",
+  "81751": "",
+  "53699": "+{value:arb}% aux gains d\u0027{%ar}.\n(+ 0.1% par niveau)",
+  "82625": "",
+  "86586": "+{value:arb}%\\ ux gains d\u0027{%ar}.\n(+ 0.2% par niveau)",
+  "3571": "",
+  "65411": "+{value:arb}% aux gains d\u0027{%ar}.\n(+ 0.2% par niveau)",
+  "49564": "",
+  "17009": "+{value:arb}% aux gains d\u0027{%ar}.\n(+ 0.3% par niveau)",
+  "85323": "",
+  "23808": "+{value:arb}% aux gains d\u0027{%ar}.\n(+ 0.3% par niveau)",
+  "5790": "",
+  "3358": "+{value:arb}% aux gains d\u0027{%ar}.\n(+ 0.3% par niveau)",
+  "28246": "",
+  "60977": "Quand votre héros libère une \u003cb\u003eAURA\u003c/b\u003e\\_:\\v Ajoute +{value:wak} à votre niveau de {#WAKFU}."
 }
\ No newline at end of file
diff --git a/data/json/dico/Spells.json b/data/json/dico/Spells.json
index 807f240dc99d203e075fdf744918653e1cfc937b..e7cd8141da040c50ab0d884c0ba9342e6bb63d3d 100644
--- a/data/json/dico/Spells.json
+++ b/data/json/dico/Spells.json
@@ -1,67 +1,37 @@
 {
-  "2213": "-1",
-  "21500": "",
-  "13475": "",
+  "1036": "Spells",
   "1148": "Racines attirantes",
   "83174": "Inflige {magicalDamage:dmg}.\nAttire la cible vers un autre personnage.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAbrak\u0027nid putréfié\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "47254": "Esprit de la Meute",
   "95638": "Inflige {magicalDamage:dmg} + {magicalDamage:dmg2} par invocation allié.",
-  "48085": "",
-  "98923": "",
+  "48085": "Canon Boom",
+  "98923": "Inflige {magicalDamage:dmg} et déclenche {explosion:ex} sur la cible.\n\\---\nLibère les {#SIGHT[MIRES]} de votre héros.\n\\---\nRéduit de 1\\_{%pa} le coût de ce sort par {#SIGHT} que possède votre héros.",
   "26492": "Nocturancie",
   "11980": "Inflige {magicalDamage:dmg}\\v et confère {#PHASE} à votre héros pour le tour.\nPlace le sort {Spell:636} dans votre main.",
-  "49530": "",
-  "87538": "",
   "93657": "Grande Fiole de Frayeur",
-  "49787": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "49787": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "26798": "Foncer dans le Tas",
   "97857": "Un allié charge un adversaire aligné et lui inflige son {%AT} + {magicalDamage:dmg} par case parcourue.",
   "7381": "Tir Féroce",
   "96928": "Inflige {magicalDamage:dmg} à un personnage aligné à votre héros.\n\\---\n+{magicalDamage:d0} par case entre votre héros et la cible.",
-  "49414": "Flèche explosive",
-  "12850": "Inflige {@damages@} à une cible et aux personnages autour de la cible.",
-  "36383": "Tir Concentré",
-  "95952": "Consomme tous vos PA restants.\nInflige {@damages@} par PA consommé.",
-  "89015": "Tir Croisé",
-  "11284": "Inflige {@damages@}.\nSi un allié est adjacent à la cible, piochez un sort.",
   "3919": "Charge sylvestre",
   "17985": "Un personnage \u003cb\u003echarge\u003c/b\u003e de {cell:c} en ligne.\nInflige {magicalDamage:dmg}.",
   "37502": "Compassion",
   "91568": "Inflige {magicalDamage:dmg}.\n{#SUPPORT}\\_: -1\\_{%PA} au coût de ce sort.",
-  "31024": "Arbre à Chat",
-  "19793": "Sur 3 ou moins : Inflige autant de dégâts à un personnage +{magicalDamage:dmg}.\nSur 4 ou plus : Soigne d\u0027autant de PV un personnage +0...2...4.",
-  "13217": "Bond du Félin",
-  "95518": "Déplace votre Héros de 2 cases.\nIl subit 1d6 dégâts +0.",
   "49842": "Brelan",
   "14565": "Inflige 0 dégât.\nInflige 2 dégâts supplémentaires si vous avez au moins 3 Terre.",
   "4995": "Chachacha",
   "71280": "Invoque un CHACHA sur une case {#ADJACENT[ADJACENTE]} à votre héros.",
   "52700": "Coup Critique",
   "71945": "Pour ce tour, vos Compagnons infligent 1D6 +0 supplémentaires lors de leur attaque.",
-  "67755": "Dé Assommant",
-  "96839": "Inflige 1D6.\nVotre adversaire perd une carte aléatoire de sa main sur 3 ou moins.",
-  "54022": "Dé du Chateux",
-  "67126": "Inflige 1D6 +0.\n-1 niveau dans chaque jauge adverse sur 3 ou moins.",
-  "63680": "Dé Ecaflip",
-  "83556": "Inflige 1D6 +0.\nRécupérez ce sort sur 3 ou moins.",
-  "40191": "Dé Motivant",
-  "61841": "Inflige 1D6 +0.\n+2 PA pour ce tour sur 3 ou moins.",
-  "93872": "Dé Protecteur",
-  "6643": "Confère 1D6 +0...5...9 d\u0027Armure.\n+2 Armure sur 3 ou moins.",
-  "70092": "Dé Terreux",
-  "16783": "Inflige 1D6 +0.\n+2 Terre sur 3 ou moins.",
-  "98933": "Dé Venteux",
-  "55943": "Inflige 1D6 +0.\n+2 Air sur 3 ou moins.",
   "88596": "Full",
   "80879": "Inflige 0 dégât.\nPour ce tour : Le coût de votre prochain sort est réduit de 1 PA si vous avez au moins 3 Air.",
-  "64140": "Relance",
-  "24337": "Défaussez votre main.\nPiochez autant de cartes que de cartes défaussées.",
   "65493": "Trèfle",
   "96498": "",
   "31681": "Fendre l\u0027Air",
   "19427": "Inflige {magicalDamage:dmg}.\n\\---\nVotre héros gagne {value:nb}\\_AURAS\\_{#WINDSWORD[ÉPÉES DES VENTS]} si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "78227": "Brise",
-  "51129": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: Repousse d\u00271\\_case les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e à votre héros.",
+  "51129": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: {#PUSH} d\u00271\\_case les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e à votre héros.",
   "3641": "Foudroyer",
   "3713": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "58505": "Uppercut",
@@ -69,7 +39,7 @@
   "7445": "Dag",
   "14645": "Inflige {magicalDamage:dmg}.\n\\---\nVotre héros gagne {value:nb}\\_AURA\\_{#ICESWORD} si la cible a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
   "57982": "Intimidation",
-  "62708": "Inflige {magicalDamage:dmg} aux personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\n{#MELEE}\\_: Repousse les cibles d\u00271 case.",
+  "62708": "Inflige {magicalDamage:dmg} aux personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\n{#MELEE}\\_: {#PUSH} les cibles d\u00271 case.",
   "55615": "Jabs",
   "16598": "Inflige {magicalDamage:dmg}.",
   "92839": "Poing de Glace",
@@ -79,37 +49,29 @@
   "48394": "Tonnerre en Série",
   "61371": "Inflige {magicalDamage:dmg}.\n\\---\n{#BOUNCE} si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "5467": "Crochet",
-  "49049": "Inflige {magicalDamage:dmg} et repousse de {cell:c}.\n\\---\n{#AFFINITY}\\_: Piochez {value:s}\\_sort.",
+  "49049": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.\n\\---\n{#AFFINITY}\\_: Piochez {value:s}\\_sort.",
   "29150": "Cri de Guerre",
   "46810": "Confère +{attackBoost:at} à un allié par compagnon allié en jeu.",
-  "79740": "",
-  "5226": "",
-  "35212": "Maléfice humide",
-  "69586": "Inflige {magicalDamage:dmg}.\nAjoute {value:pa}\\_{%pa} à la {%reserve} si la cible est {#WET[MOUILLÉE]}\u003csprite name\u003dwet\u003e.",
   "5436": "Éffondrement",
   "55702": "Inflige {magicalPowerValue:min} à {magicalDamage:max} au bord du plateau\\vet construit 3\\_à\\_5\\_{ObjectMechanism:1607[ROCHERS]} au bord du plateau.",
-  "63382": "",
-  "47558": "",
-  "67547": "",
-  "54476": "",
+  "67547": "Traversée Spectrale",
+  "54476": "Déplace votre héros de {cell:c} en ligne et inflige {magicalDamage:dmg} aux personnages traversés.\n\\---\nAjoute {addReserve:pa} par personnage traversé.",
   "89889": "Kitsu d\u0027Entraînement",
   "89289": "Construit un {ObjectMechanism:964}.",
   "75813": "Vertige",
-  "17506": "-{value:at}\\_{%AT} et -{value:pm}\\_{%PM} à votre héros \\vquand ce \u003cb\u003eBLÂME\u003c/b\u003e est en main.\n{#FRUCTOSE} : -2\\_{%pa} au coût de ce \u003cb\u003eBLÂME\u003c/b\u003e.\n{#UNION}\\_(2)\\_: Fusionne en {Spell:423}.",
-  "99519": "Glissade Boueuse",
-  "95369": "Téléporte un {summoning:502} jusqu\u0027à deux {cell:c} en ligne.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eCraqueboule Élancé\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "17506": "-{value:at}% de dégâts physiques et -{value:pm}\\_{%PM} à votre héros quand ce \u003cb\u003eBLÂME\u003c/b\u003e est en main.\n{#FRUCTOSE} : -2\\_{%pa} au coût de ce \u003cb\u003eBLÂME\u003c/b\u003e.\n{#UNION}\\_(2)\\_: Fusionne en {Spell:423}.",
+  "99519": "Formation tortue",
+  "95369": "Confère {armor:ar} à chaque allié par personnage allié autour de lui\\_\u003csprite name\u003dcell_around\u003e.\n\\---\n{%CantGoToDeck}",
   "40610": "Orgie",
   "57815": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#HERD}\\_: Pioche 1 sort.",
-  "64657": "Recomposition",
-  "33150": "Un {summoning:298} échange sa position avec un {#CRAQUELOROC}.\nConfère {value:v}\\_{%AR} et {value:v}\\_{%BL} aux cibles.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eRocqueur\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "53193": "Champion de l\u0027Onde",
-  "92425": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.128.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e et  \u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Ajoute le sort {Spell:38} à votre main si vous n\u0027en avez pas.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_{#CHAMPIONAURA[AURA CHAMPION]}",
+  "92425": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.128.boost}% aux dégâts magiques et physiques\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA[AURAS CHAMPION]}\n\\---\n{#DEATHBLOW}\\_: {addReserve:Skill.128.pa}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_{#CHAMPIONAURA}.",
   "97646": "Peine",
   "15616": "Inflige {magicalDamage:dmg} à votre héros.\n+{value:pm}\\_{%pm} à votre héros pour le tour.",
   "53074": "Sprint Mortel",
   "20030": "Déplace un Chafer en ligne.\n\\---\nInflige son {%at} aux adversaires traversés.",
   "50696": "Intimidation Sauvage",
-  "87168": "Inflige {magicalPowermagicalPowerValue:min} à {magicalDamage:dmg}.\nAugmente le coût du prochain compagné joué par la cible de 2 si elle est {#TAGGED[MARQUÉE]}.",
+  "87168": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\nAugmente le coût du prochain compagné joué par la cible de 2 si elle est {#TAGGED[MARQUÉE]}.",
   "87123": "Aiguille",
   "52578": "Inflige {magicalDamage:dmg} sur les {cell:c} devant votre héros.\n\\---\nAjoute {addReserve:r} par adversaire touché.",
   "42439": "Flèche Enflammée",
@@ -120,16 +82,14 @@
   "98658": "Le \u003cb\u003eChafer\u003c/b\u003e ciblé attire un adversaire aligné jusqu\u0027à {cell:c} et déclenche son \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "30960": "Choc Temporel",
   "57911": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
-  "82579": "Concentration",
-  "51144": "Inflige {@damages@}.\nPiochez 1 sort si vous avez au moins 5 PA en Réserve.",
   "74379": "Magnétisation",
-  "69208": "Inflige {magicalDamage:dmg}.\n\\---\nAttire les \u003cb\u003eMÉCANISMES\u003c/b\u003e alignés de {cell:c}.",
+  "69208": "Inflige {magicalDamage:dmg}.\n\\---\nAttire les \u003cb\u003eMÉCANISMES\u003c/b\u003e alignés avec la cible de {cell:c}.",
   "74945": "Poussière Temporelle",
   "29692": "Inflige {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.",
   "31171": "Montée en Grade",
   "59876": "Fait évoluer un \u003cb\u003eARCHER\u003c/b\u003e ou \u003cb\u003eFANTASSIN\u003c/b\u003e allié.\n\\---\n{#COMBO} : Pioche un sort.",
   "67512": "Armée des Morts",
-  "25118": "Inflige {magicalDamage:min} à {magicalDamage:max}.\n\\---\nPiochez le sort {Spell:30697} si la cible a l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
+  "25118": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nPiochez le sort {Spell:30697} si la cible a l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
   "34011": "Effet larvant",
   "26615": "Invoque 2\\_{summoning:329[LARVES]}.\nSoigne de {value:pv}\\_{%pv}.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAbrak\u0027nid bagarreur\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "1831": "Science des Mécanismes",
@@ -144,41 +104,31 @@
   "33563": "Inflige {magicalDamage:dmg}.\n\\---\nÉchange la position de votre héros avec celle de la cible si elle a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "25622": "Téléportation Courte",
   "66557": "Téléporte votre héros jusqu\u0027à {cell:c}.\n\u003cb\u003eOU\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.\n\\---\nInflige ensuite {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
-  "99142": "Téléportation Forcée",
-  "35663": "Téléporte un adversaire jusqu\u0027à {cell:c}.\n{%CantGoToDeck}",
   "61641": "Charge Puissante",
-  "33509": "Un allié charge un adversaire aligné jusqu\u0027à {cell:c}, lui inflige son {%AT} et le repousse de {cell:c2}.",
-  "32740": "Xelorium",
-  "4971": "Inflige {@damages@} à un personnage.\nTous vos SINISTROS infligent 2 dégâts sur leurs lignes.",
+  "33509": "Un allié charge un adversaire aligné jusqu\u0027à {cell:c}, lui inflige son {%AT} et le {#PUSH} de {cell:c2}.",
   "23345": "Hypnose de Toxine",
   "4676": "{Companion:231} \u003cb\u003echarge\u003c/b\u003e de {value:(c-1)}\\_cases en ligne et {#STUN[ASSOMME]} sa cible.",
   "15656": "Peur du Noir",
-  "33595": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "33595": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "79794": "Attirance Surnaturelle",
   "14387": "Attire un personnage aligné avec votre fantôme.",
   "37359": "Verrouillage",
   "96073": "Un \u003cb\u003eBwork\u003c/b\u003e {#ANGRYDRIVE[ENRAGÉ]} déclenche son \u003cb\u003eATTAQUE\u003c/b\u003e sur un personnage adjacent\\_\u003csprite name\u003dcell_cross\u003e et l\u0027{#HUG[ÉTREINT]}.",
-  "70623": "Choc Sinistre",
-  "51172": "Inflige {@damages@} OU charge ce sort sur un SINISTRO allié.",
   "32132": "Vitamine",
-  "11129": "Un allié se déplace de {cell:c} en ligne et gagne +{value:at}\\_{%AT} pour le tour.",
+  "11129": "Un allié se déplace de {cell:c} en ligne et gagne +{value:at}% de dégâts physiques pour le tour.",
   "36537": "Déferlante",
-  "4746": "Inflige {magicalPowermagicalPowerValue:min} à {magicalDamage:max}.\n\\---\nPose un {FloorMechanism:1606}\\vsur une cellule adjacente à la cible.",
-  "1499": "Ralentissement",
-  "93853": "Inflige {@damages@}.\n-1 PA à votre adversaire si vous avez au moins 3 Eau.",
+  "4746": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nPose un {FloorMechanism:1606}\\vsur une cellule adjacente à la cible.",
   "71559": "Petit Pet",
-  "66195": "Inflige {value:min} à {magicalDamage:max} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eCochon\u003c/b\u003e allié et repousse ceux adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC}.",
+  "66195": "Inflige {value:min} à {magicalDamage:max} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eCochon\u003c/b\u003e allié et {#PUSH} ceux adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.",
   "88155": "Toucher de Coqueline",
-  "62193": "Transforme en \u003cb\u003eTOFU\u003c/b\u003e pour le tour.\n\\---\n\u003cb\u003eTOFU\u003c/b\u003e : {#PHASE}, +{value:pm}\\_{%pm} et {attackBoost:at}.",
+  "62193": "Transforme en \u003cb\u003eTOFU\u003c/b\u003e pour le tour.\n\\---\n\u003cb\u003eTOFU\u003c/b\u003e : {#PHASE}, +{value:pm}\\_{%pm} et {value:at}% aux dégâts physiques.",
   "37234": "Archerie",
-  "82913": "Confère 2\\_{#SIGHT[MIRES]} à un allié.",
-  "31086": "Sinistro Air",
-  "55079": "Invoque un SINISTRO sur une case adjacente à votre Héros.\nApparition : Gagne 1 Blindage.\nInsensible aux dégâts des sorts.",
+  "82913": "Confère {value:s}\\_{#SIGHT[MIRES]} à un allié.",
   "29084": "Dragobus",
-  "71394": "Inflige {magicalPowermagicalPowerValue:min} à {magicalDamage:dmg}.\nAjoute un {Spell:450} dans la main de la cible si elle est {#GLYCEMIA[GLYCÉMIQUE\\_\u003csprite name\u003dgeneric_monster\u003e]}.",
+  "71394": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\nAjoute un {Spell:450} dans la main de la cible si elle est {#GLYCEMIA[GLYCÉMIQUE\\_\u003csprite name\u003dgeneric_monster\u003e]}.",
   "88711": "Permutation",
   "73529": "Inflige {magicalDamage:dmg}.\n\\---\nAjoute {addReserve:r} s\u0027il y a un \u003cb\u003eMÉCANISME\u003c/b\u003e allié en jeu.",
-  "77601": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "77601": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "2491": "Hantise",
   "53889": "Construit un {ObjectMechanism:955} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:955} déjà en jeu.",
   "96673": "Sinistro Feu",
@@ -188,8 +138,6 @@
   "35715": "Dernier Souffle",
   "9697": "Construit un {ObjectMechanism:583} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:583} déjà en jeu.",
   "31462": "Sinistro Terre",
-  "61906": "Consomme 10 Points de Réserve.\nVotre adversaire ne peut pas jouer de sorts lors de son prochain tour.",
-  "92424": "Maitrise Temporelle",
   "92367": "Hécatombe",
   "60737": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg} à tous les adversaires.\n{#DEATHBLOW}\\_: Rejoue ce sort.",
   "14617": "Saveur Douce",
@@ -198,13 +146,13 @@
   "9086": "Lance un projectile par sort \u003cb\u003eDraconique\u003c/b\u003e équipé sur un adversaire aléatoire.\n\\---\nChaque projectile inflige {magicalDamage:dmg}.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "40503": "Soigne {heal:h}\\v et retire l\u0027état élémentaire.",
   "37643": "Résonance des Corps",
-  "9371": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "9371": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "82003": "Petite Fiole de Frayeur",
   "53078": "Téléporte votre héros\\v sur une case {#ADJACENT[ADJACENTE]} à un allié.\nSoigne les alliés {#ADJACENT[ADJACENTS]}\\v à la case d\u0027arrivée de {heal:h}.",
   "11916": "Soins d\u0027Urgence",
   "31050": "Soigne {heal:h}.\n{%CantGoToDeck}",
   "25691": "Soin Purifiant",
-  "15763": "Le VOLCAN inflige {magicalDamage:dmg} sur {magicalPowerValue:min} à {cell:max} aléatoires.\nPose une {FloorMechanism:278} sur les cases libres.\n\\---\nRepousse tous les personnages de {value:cmin} à {cell:cmax} dans une direction aléatoire.\n\\---\nLe coût de ce sort est réduit de 1\\_{%pa} s\u0027il y a au moins {value:flaque}\\_{FloorMechanism:278[FLAQUES DE LAVE]} en jeu.",
+  "15763": "Le VOLCAN inflige {magicalDamage:dmg} sur {magicalPowerValue:min} à {cell:max} aléatoires.\nPose une {FloorMechanism:278} sur les cases libres.\n\\---\n{#PUSH} tous les personnages de {value:cmin} à {cell:cmax} dans une direction aléatoire.\n\\---\nLe coût de ce sort est réduit de 1\\_{%pa} s\u0027il y a au moins {value:flaque}\\_{FloorMechanism:278[FLAQUES DE LAVE]} en jeu.",
   "59888": "Colère du volcan",
   "45334": "Ça Me Fait Plus Mal Qu\u0027à Toi",
   "22855": "Inflige {magicalDamage:dmg}.\n-3\\_{%pa} au coût de ce sort si votre héros {#AGONY[AGONISE]}.",
@@ -214,8 +162,8 @@
   "64838": "Doper",
   "98284": "Craquelures",
   "83731": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\nApplique {#CRUMBLED}.",
-  "64856": "+2 PA jusqu\u0027à la fin du tour.\nVotre Héros gagne 1 AR.",
-  "37482": "Assurance",
+  "64856": "Confère {value:pm} {%PM} à tous les héros alliés pour le tour.\n\\---\n{%CantGoToDeck}",
+  "37482": "Double élan",
   "1616": "Exhumation",
   "61844": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nPose une {ObjectMechanism:249} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e de la cible si elle a l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
   "10463": "Sacrifice Honteux",
@@ -230,22 +178,16 @@
   "34214": "Transforme un \u003cb\u003eSINISTRO\u003c/b\u003e allié en {ObjectMechanism:807}.",
   "90504": "Transforme un \u003cb\u003eSINISTRO\u003c/b\u003e allié en {ObjectMechanism:1653}.",
   "44868": "Hydruille",
-  "84249": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:dmg2} par \u003cb\u003eMIRE\u003c/b\u003e que possède votre héros.",
+  "84249": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:dmg2} par {#SIGHT} que possède votre héros.",
   "45352": "Décharge Pétulante",
   "47950": "Xelorium",
   "53638": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.",
-  "68755": "À chaque fois que votre Héros reçoit des dégâts physiques, il inflige {@damages@}.",
-  "81324": "Contre",
+  "68755": "Le coût des sorts alliés est réduit de \\v1\\_{%PA} jusqu’au début de votre prochain tour.\n\\---\n{%CantGoToDeck}",
+  "81324": "Bonté Divine",
   "49470": "Téléportation Accélérée",
-  "19691": "Téléporte votre héros d\u0027{cell:c}\n\u003cb\u003eOU\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.\n\\---\nConfère +{armor:ar} à votre héros.",
-  "35442": "Babydruille",
-  "70165": "Transforme un de vos \u003cb\u003eSINISTROS\u003c/b\u003e en {objectMechanism:667}.",
-  "47944": "Inflige {magicalDamage:dmg}.\n\u003cb\u003eCOUP DE GRÂCE\\_:\u003c/b\u003e Votre héros gagne {armor:ar}.",
-  "6707": "Choc du Golem",
+  "19691": "Téléporte votre héros de {cell:c}\n\u003cb\u003eOU\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.\n\\---\nConfère +{armor:ar} à votre héros.",
   "86876": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\n{#BOUNCE} si la cible a l\u0027état \u003cb\u003eBATSU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e.",
   "55114": "Hachoir",
-  "47534": "",
-  "81579": "",
   "23729": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
   "86659": "Siber",
   "73682": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: -1\\_{%PA} au coût de ce sort.",
@@ -258,17 +200,15 @@
   "44459": "Onde de Choc",
   "19121": "Votre héros \u003cb\u003echarge\u003c/b\u003e un personnage aligné jusqu\u0027à {cell:c} et lui inflige {magicalDamage:dmg}.\n\\---\nApplique {frozen:PropertyEffect.26.FrozenDmg} si la cible a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
   "3875": "Charge Glaciale",
-  "37863": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: +{attackBoost:at} à votre héros pour le tour.",
+  "37863": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: +{value:at}% aux dégâts physiques à votre héros pour le tour.",
   "44279": "Fulgur",
-  "9366": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: +{attackBoost:at} à votre héros pour le tour.",
+  "9366": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: +{value:at}% aux dégâts physiques à votre héros pour le tour.",
   "69900": "Corriger",
-  "4480": "Inflige {magicalDamage:dmg} sur les {cell:c} devant votre héros.\n\\---\n{#AFFINITY}\\_: +{attackBoost:at} à votre héros pour le tour.",
+  "4480": "Inflige {magicalDamage:dmg} sur les {cell:c} devant votre héros.\n\\---\n{#AFFINITY}\\_: +{value:at}% aux dégâts physiques à votre héros pour le tour.",
   "22363": "Fondre le Sol",
   "27140": "Fondre la Vie",
   "3561": "Inflige {magicalDamage:dmg} aux {cell:c} devant le héros.\n\\---\n{#LIFESTEAL}",
-  "8579": "",
-  "51105": "",
-  "50194": "Inflige {magicalDamage:dmg} et repousse de {cell:c}.\n\\---\n{#REWIND} si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
+  "50194": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.\n\\---\n{#REWIND} si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "27754": "Frappe Temporelle",
   "81406": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "65804": "Flétrissement",
@@ -296,8 +236,6 @@
   "43150": "Flamme Huilée",
   "36944": "Les \u003cb\u003eMÉCANISMES\u003c/b\u003e alliés gagnent {value:p}% de {%bl}.",
   "47300": "Éternité",
-  "59931": "Le Compagnon de votre choix peut à nouveau se déplacer et attaquer.",
-  "74015": "Garde Temps",
   "4612": "Inflige {magicalDamage:dmg}.\n\\---\nAjoute {addReserve:r} s\u0027il y a un \u003cb\u003eMÉCANISME\u003c/b\u003e allié en jeu.",
   "15337": "Vol du Temps",
   "47451": "Inflige {magicalDamage:dmg}.\n\\---\nVole {value:v}\\_{%pa} à la {%reserve} de la cible si elle a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e ou \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy/\u003e.",
@@ -322,16 +260,12 @@
   "28613": "Aiguille Astrale",
   "76082": "Inflige {magicalDamage:dmg}.\n\\---\n{#PETRIFY[PÉTRIFIE]} votre héros s\u0027il possède au moins {value:v}\\_AURAS.",
   "31340": "Ciment",
-  "97215": "Votre Héros gagne l\u0027effet \u003cb\u003eCONTRE\u003c/b\u003e si la cible est \u003cb\u003eMOUILLÉ\u003c/b\u003e.",
-  "50752": "Contre",
   "96347": "Assaut Corné",
   "96652": "Un \u003cb\u003eBOUFTOU\u003c/b\u003e déclenche son \u003cb\u003eATTAQUE\u003c/b\u003e\\vsur les adversaires {#ADJACENT[ADJACENTS]!}.",
   "79948": "Inflige {magicalDamage:dmg}.\n\\---\nConfère autant d\u0027{%AR} à votre héros.",
   "44176": "Xélorisation",
-  "81273": "Inflige {magicalDamage:dmg} +{magicalDamage:mult} par {%PA} dans votre {%reserve}. Consomme votre {%reserve}.",
+  "81273": "Inflige {magicalDamage:dmg}.\n\\---\n+{magicalDamage:mult} par {%PA} dans votre {%reserve}.\n\\---\nConsomme votre {%reserve}.",
   "13273": "Maîtrise Temporelle",
-  "21285": "Gravure",
-  "15945": "Déplace le FORGERON de 4 cases.",
   "21607": "Pic Glacial",
   "651": "Inflige {magicalDamage:dmg}.\n\\---\nApplique {frozen:PropertyEffect.26.FrozenDmg} si la cible a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
   "19176": "Tsunami",
@@ -376,14 +310,10 @@
   "50229": "Fondre l\u0027Âme",
   "54619": "Inflige {magicalDamage:dmg}.\n\\---\n{#DEATHBLOW}\\_: {addReserve:r}.",
   "48025": "Précision",
-  "44522": "Déplace un allié de {cell:c} en ligne.\nInflige {magicalDamage:dmg} et {#STUN[ASSOMME]!} les adversaires traversés.",
-  "41435": "Chant du tigre",
-  "76958": "Appliquer l\u0027état {#STUN} si la cible est sous l\u0027état {#MUDDY}",
-  "36700": "Assommer",
   "40624": "Bond",
   "90219": "Téléporte un personnage allié de {cell:c}.",
   "29325": "Charge",
-  "80092": "Votre héros \u003cb\u003echarge\u003c/b\u003e un personnage aligné et lui inflige {magicalDamage:dmg} +{value:mult} par case parcourue.",
+  "80092": "Votre héros \u003cb\u003echarge\u003c/b\u003e un personnage aligné et lui inflige {magicalDamage:dmg}.\n\\---\n+{value:mult} dégâts par case parcourue.",
   "38023": "Inflige {magicalDamage:dmg}.\n\\---\nAjoute {addReserve:r} s\u0027il y a un \u003cb\u003eMÉCANISME\u003c/b\u003e allié en jeu.",
   "44927": "Analyse",
   "8458": "Écailles d\u0027Adamaï",
@@ -401,8 +331,6 @@
   "969": "Fureur de Tristepin",
   "62425": "Inflige {magicalDamage:dmg}.\n\\---\n{#ACCURACY}\\_: Vole 1\\_{%pa} à la {%reserve} de la cible.",
   "38538": "Trait Bouillant",
-  "59766": "Inflige {magicalDamage:dmg} et applique l\u0027état {#WET}.\n{#REWIND}",
-  "84321": "Vieille Frappe",
   "7553": "Construit une {ObjectMechanism:1486} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un allié.\n\\---\nDétruit votre précédente {ObjectMechanism:1486}.\n{#MECHANISM[]}",
   "17084": "Bombe de Remington",
   "26490": "Ombres de Julith",
@@ -416,8 +344,6 @@
   "84905": "Tornadoulet",
   "44050": "Pacification",
   "61681": "Inflige {magicalDamage:dmg}.\n{#SUPPORT}\\_: -1\\_{%PA} au coût de ce sort.",
-  "60338": "",
-  "61431": "",
   "38014": "Casse-Crâne",
   "93680": "Inflige {magicalDamage:dmg}.\n{#STUN[ASSOMME]} la cible si elle est {#MUDDY[BOUEUSE]}\u003csprite name\u003dmuddy\u003e.",
   "18227": "Bouclier de Bump",
@@ -434,46 +360,30 @@
   "78610": "Pichenette",
   "41780": "Construit une {ObjectMechanism:1309} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\nDétruit votre {ObjectMechanism:1309} déjà en jeu.",
   "66171": "Meurtrière",
-  "3066": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Inflige {magicalDamage:dmg1} à votre héros\\vsi ce \u003cb\u003eBLÂME\u003c/b\u003e est en main.\n{#UNION}\\_({value:union})\\_: Inflige {magicalDamage:dmg2} et -{value:at}\\_{%AT} à votre héros. Défausse 3\\_{Spell:104[MALADIES]!}.",
+  "3066": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Inflige {magicalDamage:dmg1} à votre héros\\vsi ce \u003cb\u003eBLÂME\u003c/b\u003e est en main.\n{#UNION}\\_({value:union})\\_: Inflige {magicalDamage:dmg2} et -{value:at}% de dégâts physiques à votre héros. Défausse 3\\_{Spell:104[MALADIES]!}.",
   "46980": "Maladie",
-  "45697": "Inflige {magicalDamage:dmg}.",
-  "49407": "Jet de Pierre",
   "71576": "Inflige {magicalDamage:dmg} dans la zone \u003csprite name\u003dcell_circle2\u003e ciblée.\n\\---\nLes cibles qui ont l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled/\u003e déclenchent {explosion:ex}.",
   "53720": "Maelstrom de Flèches",
   "57645": "Chute de Pierre",
   "63219": "Construit 1\\_à\\_2 {ObjectMechanism:1607[ROCHERS]}\\vsur les cases {#ADJACENT[ADJACENTES]} à un adversaire.",
-  "38914": "Éclair Drainant",
-  "96092": "Tuez un de vos Compagnons. Votre Héros gagne 6\\_\u003cb\u003eAT\u003c/b\u003e de plus jusqu\u0027à la fin du tour.",
   "72196": "Rocanon",
   "40121": "Téléporte un {ObjectMechanism:1607}\\v sur une case {#ADJACENT[ADJACENTE]} à un adversaire.\nInflige ensuite {magicalPowerValue:min} à {magicalDamage:max} {#AROUND!} de lui.",
   "69776": "Piochez {value:s}\\_sorts.",
   "14526": "Ush le Tricheur",
-  "76028": "Sécrétion",
-  "25558": "Confère 1\\_\u003cb\u003eTOILE\u003c/b\u003e\nou +{attackBoost:at} si la cible en possède déjà 3.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eArak\u0027nid\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "51023": "Exécution",
   "58490": "Sacrifie un allié.\nInvoque un Sbire du Clan Surin.",
   "51085": "Fusion",
   "42731": "Détruit l\u0027{%ar} d\u0027un allié et inflige autant de dégâts aux adversaires {#AROUND!} de lui.",
   "69043": "Scorie brûlante",
   "61357": "Le VOLCAN inflige {magicalDamage:dmg} sur une case.\n\\---\nPose une {FloorMechanism:278} si elle est libre.",
-  "1525": "Maléfice gadouilleux",
-  "22962": "Inflige {magicalDamage:dmg}.\n{#ROOTED[IMMOBILISE]!} la cible pour la tour si elle est {#MUDDY[BOUEUSE]}\u003csprite name\u003dmuddy\u003e.",
   "17827": "Du Sang Sur Les Mains",
   "11979": "Inflige {magicalDamage:self} à votre héros\\v et inflige {magicalDamage:dmg} à un personnage {#ADJACENT}\\v à votre héros.",
   "96273": "Brasier Draconique",
   "89474": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:boost} par sort \u003cb\u003eDraconique\u003c/b\u003e équipé.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "16129": "Confère +{magicalPowerValue:min} à +{attackBoost:max} aux \u003cb\u003eCRAQUELEURS\u003c/b\u003e.\nMet \u003cb\u003eFIN AU TOUR\u003c/b\u003e.",
+  "16129": "Confère +{value:perc}% de dégâts physiques aux \u003cb\u003eCRAQUELEURS\u003c/b\u003e.\nMet \u003cb\u003eFIN AU TOUR\u003c/b\u003e.",
   "7338": "Poing Final",
-  "43063": "Jamais Fatigué",
-  "67517": "Le Compagnon de votre choix peut à nouveau se déplacer et attaquer.",
-  "41167": "Laine Rebondissante",
-  "67788": "Repousse les personnages {#ADJACENT[ADJACENTS]!} à un allié\\vde {magicalPowerValue:min} à {cell:max}.",
   "83580": "Sacrifice Nécromique",
   "36170": "Sacrifie un allié pour infliger son {%at} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e.\n\\---\nSi c\u0027est un compagnon \u003cb\u003eNécrome\u003c/b\u003e, il peut être réinvoqué.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "10795": "Éboulement",
-  "87358": "Inflige {magicalDamage:dmg} aux adversaires et fait apparaitre un {objectMechanism:1607} dans la zone ciblée \u003csprite name\u003dcell_around\u003e.",
-  "43232": "Confère {value:v}\\_{#FLIESAURA} à un \u003cb\u003eTAURE\u003c/b\u003e.",
-  "23143": "Puantaure",
   "48150": "Caillassage",
   "42065": "Détruit l\u0027{%ar} de tous les \u003cb\u003eCRAQUELEURS\u003c/b\u003e\\vet inflige autant de dégâts aux adversaires.",
   "80963": "Coulis",
@@ -483,19 +393,19 @@
   "36643": "Scalper",
   "30999": "Inflige {magicalDamage:dmg}.\n{value:pa}\\_{%PA} au prochain sort AIR\u003csprite name\u003dwind\u003e pour le tour\\v si la cible est {#VENTILATED[ÉVENTÉE]}\u003csprite name\u003dventilated\u003e.",
   "49361": "Souffle Osseux",
-  "60207": "Inflige {magicalPowerValue:min} à {magicalDamage:max} et repousse de {cell:c}.",
+  "60207": "Inflige {magicalPowerValue:min} à {magicalDamage:max} et {#PUSH} de {cell:c}.",
   "64236": "Flèche Huilée",
   "99302": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled/\u003e.",
-  "60278": "Course Folle",
-  "38893": "JORIS gagne 3\\_\u003cb\u003ePM\u003c/b\u003e et 2\\_\u003cb\u003eAT\u003c/b\u003e jusqu\u0027à la fin du tour.",
-  "84476": "Tête Baissée",
-  "3545": "Inflige {magicalDamage:dmg1}, {magicalDamage:dmg2} ou {magicalDamage:dmg3}.",
+  "60278": "Résilience",
+  "38893": "Inflige {magicalDamage:dmg}.\nConfère l\u0027équivalent en {%AR} à votre héros.",
+  "84476": "Napalm",
+  "3545": "Inflige {magicalDamage:dmg} à tous les personnages alignés à votre héros.\n\\---\n{%CantGoToDeck}",
   "36941": "Algarade",
   "51580": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: Piochez 1\\_sort.",
   "89869": "Confère {value:a}\\_AURAS à un héros allié s\u0027il en possède une.",
   "14881": "Acharnement",
   "83585": "Bouclier",
-  "27523": "Confère {#SHIELD} et {value:nb}\\_AURA à un allié.",
+  "27523": "Confère {#SHIELD} et {value:nb}\\_\u003cb\u003eAURA\u003c/b\u003e à un allié.",
   "22737": "Invoque {Summoning:906} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.",
   "33902": "Légendarus",
   "68981": "Épées de Riposte",
@@ -517,7 +427,7 @@
   "50920": "Inflige {magicalDamage:dmg}\\v à un personnage aligné à votre héros.\nAttire la cible vers votre héros\\v si elle est {#VENTILATED[ÉVENTÉE]}\u003csprite name\u003dventilated\u003e.",
   "37708": "Grappin Nocturne",
   "11667": "Pulsion",
-  "60551": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "60551": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "1519": "Construit un {FloorMechanism:191}\\v jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n{#REWIND}",
   "51448": "Piège Sans Fin",
   "58662": "Piège Lébin",
@@ -585,12 +495,12 @@
   "97825": "Inflige {magicalDamage:d0}\\v \u003cb\u003eOU\u003c/b\u003e\\v inflige {magicalDamage:d1}\\v si votre héros a moins de {heal:h}.",
   "95192": "Dernier Chant",
   "25372": "Sanglade",
-  "63365": "Inflige {magicalDamage:dmg}\\v et repousse d\u0027{cell:c}.",
+  "63365": "Inflige {magicalDamage:dmg}\\v et {#PUSH} d\u0027{cell:c}.",
   "35661": "Le Grand Mornifleur",
   "48604": "Invoque {Summoning:311}\\v sur une case {#ADJACENT[ADJACENTE]} à votre héros",
   "950": "Passe Muraille",
   "67748": "Confère {#PHASE}\\v et +1\\_{%pm} par {%pa} dans votre {%reserve}\\v à votre héros pour le tour.",
-  "92348": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "92348": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "32859": "Corbonade",
   "20389": "Inflige {magicalDamage:dmg}.\n{#REWIND}",
   "26002": "Fessée",
@@ -694,7 +604,7 @@
   "15152": "Épées Sanglantes",
   "90943": "Confère {value:sw}\\_AURAS\\_{#BLEEDINGSWORD[ÉPÉES SANGLANTES]} à un héros allié.",
   "83818": "Poings Frénétique",
-  "75640": "Transforme les AURAS de votre héros en AURAS\\_{#FRENZIEDFIST}.",
+  "75640": "Transforme les \u003cb\u003eAURAS\u003c/b\u003e de votre héros en \u003cb\u003eAURAS\u003c/b\u003e\\_{#FRENZIEDFIST[POINGS FRÉNÉTIQUES]}.",
   "60504": "Détruit un \u003cb\u003eMÉCANISME\u003c/b\u003e allié pour infliger des dégâts égaux à son {%bl} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e.",
   "6835": "Destructuration",
   "12547": "Accélérateur",
@@ -705,8 +615,6 @@
   "15777": "Confère {value:c}\\_AURAS {#AVENGERHOURGLASS[SABLIERS VENGEURS]} à un héros allié.",
   "12541": "Chibi Cadrans",
   "3851": "Confère {value:c}\\_AURAS {#CHIBIDIAL[CHIBI CADRANS]} à un héros allié.",
-  "38531": "Armure Temporelle",
-  "52204": "Confère {#RIPOSTE}\\_({value:rip}) à votre héros\\v jusqu\u0027à votre prochain tour.\nConfère {value:a}\\_{#AURA} à votre héros s\u0027il en possède une.",
   "99518": "Sarcophagus",
   "17558": "Invoque {Summoning:825} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\nQuand vous ajoutez 1\\_{%pa} à votre {%reserve}\\_:\nLe coût de ce sort est réduit de 1\\_{%pa}.",
   "93698": "Derrière Toi",
@@ -731,8 +639,8 @@
   "36876": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: +{armor:ar} à votre héros.",
   "32384": "Déclenche le pouvoir d\u0027un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.",
   "58637": "Boom",
-  "2554": "Bidon d\u0027Eau",
-  "97066": "Applique {#WET!}.",
+  "2554": "Prompt rétablissement",
+  "97066": "Soigne un allié de {valueAndNext:pv}% de ses {%PV} MAX.\n\\---\n{%CantGoToDeck}",
   "33292": "Sale Bête Infâme",
   "15212": "Invoque une {Summoning:382}\\v jusqu\u0027à {cell:c} de votre héros.",
   "14496": "Rappel",
@@ -742,8 +650,6 @@
   "37429": "Inflige {magicalDamage:dmg}.\n{#ROOTED[Immobilise]} la cible si elle est {#MUDDY[BOUEUSE]}\u003csprite name\u003dmuddy\u003e.",
   "13421": "Sournoiserie Excitante",
   "63346": "Inflige {magicalDamage:dmg}.\n+1\\_{%pm} à votre héros pour chacun de vos {#TRAP[PIÈGES]} pour le tour.",
-  "15310": "Froussardise",
-  "5022": "Confère {#UNTARGETABLE} à votre bête jusqu\u0027à votre prochain tour.\n{maturity:lvl}\\_: Confère {#UNTARGETABLE} à votre héros jusqu\u0027au prochain tour allié.",
   "44528": "Pointe Chuchotante",
   "39582": "Inflige {magicalDamage:dmg}.\n\\---\nConfère 1\\_{#SIGHT} à votre héros si la cible à l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "90371": "Pointe Acérée",
@@ -751,7 +657,7 @@
   "39427": "Pointe Venteuse",
   "56324": "Inflige {magicalDamage:dmg} et applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated/\u003e.",
   "27755": "Pointe Répulsive",
-  "99704": "Inflige {magicalDamage:dmg} et repousse de {cell:c}.",
+  "99704": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.",
   "41641": "Pointe Étoilée",
   "42522": "Inflige {magicalDamage:dmg}.\n\\---\n{#ACCURACY}\\_: Place 1\\_sort aléatoire du \u003cb\u003eGRIMOIRE DES VENTS\u003c/b\u003e dans votre main.",
   "6973": "Pointe Électrique",
@@ -779,7 +685,7 @@
   "53654": "Ataraxie",
   "94937": "Inflige {magicalDamage:dmg}.\n\\---\nPiochez {value:d}\\_sorts si aucun personnage adverse n\u0027est autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.",
   "54717": "Acrobatie",
-  "84269": "Recule votre héros de {cell:c} et inflige {magicalDamage:dmg} à un personnage aligné avec lui.",
+  "84269": "Inflige {magicalDamage:dmg} à un personnage aligné avec votre héros.\n\\---\nVotre héros recule de {cell:c}.",
   "12656": "Trait Aqueux",
   "15900": "Inflige {magicalDamage:dmg}.\n\\---\nConfère 1\\_{#SIGHT} à votre héros si la cible a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet/\u003e.",
   "95409": "Tir Enlisant",
@@ -789,7 +695,7 @@
   "64189": "Pointe Provocatrice",
   "89643": "Inflige {magicalDamage:dmg}.\n\\---\n{#BOUNCE} si la cible possède l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated/\u003e.\n\\---\n{#ACCURACY}\\_: +{magicalDamage:add}.",
   "39990": "Pointe Harcelante",
-  "90533": "Inflige {magicalDamage:dmg} et repousse d\u0027{cell:c}.",
+  "90533": "Inflige {magicalDamage:dmg} et {#PUSH} d\u0027{cell:c}.",
   "62577": "Pointe des Cieux",
   "55008": "Inflige {magicalDamage:dmg}.\n\\---\nConfère 2\\_{#SIGHT[MIRES]} à votre héros si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.",
   "47369": "Pointe des Cieux Divins",
@@ -803,7 +709,7 @@
   "66805": "Dérobade",
   "34048": "Téléporte votre héros sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un personnage ou un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.",
   "75330": "Flèche Boom",
-  "4138": "Inflige {magicalDamage:dmg}.\n\\---\n{#ACCURACY}\\_: Confère +{attackBoost:at} à votre héros pour le tour.",
+  "4138": "Inflige {magicalDamage:dmg}.\n\\---\n{#ACCURACY}\\_: Confère +{value:at}% aux dégâts physiques\\v à votre héros pour le tour.",
   "61073": "Flèche Immolante",
   "14166": "Inflige {magicalDamage:dmg}.\n\\---\nConfère 2\\_{#SIGHT[MIRES]} à votre héros si la cible a l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.",
   "98504": "Inflige {magicalDamage:dmg}.\n\\---\nConfère 1\\_{#SIGHT} à votre héros si la cible a l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.",
@@ -912,8 +818,6 @@
   "99525": "Inflige {magicalDamage:dmg} aux adversaires {#AROUND}\\v de votre héros et soigne les alliés de {heal:h}.",
   "36825": "Maître de la Régénération",
   "66642": "Confère {value:c}\\_{#REGENERATIONMASTER[COEURS RÉGÉNÉRANTS]} à un héros allié.",
-  "29755": "Fiole de Frayeur",
-  "84617": "lalalalala",
   "30442": "Maître des Compagnons",
   "78804": "Confère {value:c}\\_{#METABOOST[BOOST MÉTABOLIQUES]} à un héros allié.",
   "33867": "Assaut",
@@ -929,7 +833,7 @@
   "13723": "Tourment",
   "73521": "Inflige {magicalDamage:dmg}.\n{#AGONY}\\_: Piochez {value:s}\\_sort.",
   "56288": "Frappe Cyclone",
-  "16369": "Inflige {magicalDamage:dmg}\\v et repousse de {cell:c}.",
+  "16369": "Inflige {magicalDamage:dmg}\\v et {#PUSH} de {cell:c}.",
   "37995": "Attirance",
   "64673": "Inflige {magicalDamage:dmg}\\v à un personnage aligné avec votre héros.\nAttire la cible si elle est {#VENTILATED[ÉVENTÉE]}\u003csprite name\u003dventilated\u003e.",
   "24293": "Fulgurance",
@@ -1015,7 +919,7 @@
   "95599": "Rayonnement",
   "68234": "Inflige {magicalDamage:dmg} et applique l\u0027état {#ASTRAL}.",
   "56374": "Transformation Belatorus",
-  "4462": "Votre héros se transforme et gagne :\n+{value:FloatingCounterEffect.52.at}% d\u0027{%at}\n+{value:FloatingCounterEffect.52.pm}\\_{%pm}\n+ 3 {#CHAMPIONAURA[\u003cb\u003eAURAS BELATORUS\u003c/b\u003e]}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1 {#CHAMPIONAURA[\u003cb\u003eAURA BELATORUS\u003c/b\u003e]}",
+  "4462": "Votre héros se transforme et gagne :\n+{value:FloatingCounterEffect.52.at}% d\u0027{%at}\n+{value:FloatingCounterEffect.52.pm}\\_{%pm}\n+ 3 {#CHAMPIONAURA[\u003cb\u003eAURAS BELATORUS\u003c/b\u003e]}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1 {#CHAMPIONAURA[\u003cb\u003eAURA BELATORUS\u003c/b\u003e]}.",
   "56983": "Dans de Sales Draps",
   "63742": "Échange la position de deux personnages allié.",
   "32523": "Âme en Peine",
@@ -1025,15 +929,13 @@
   "48838": "Fémur",
   "38341": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\n+{magicalDamage:dmg} supplémentaires si la cible est sur le bord du plateau.",
   "86791": "Charge Crâneuse",
-  "92826": "Un \u003cb\u003eChafer\u003c/b\u003e allié \u003cb\u003echarge\u003c/b\u003e un personnage aligné jusqu\u0027à {cell:c} et inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nRepousse la cible de {value:v} à {cell:d}.",
+  "92826": "Un \u003cb\u003eChafer\u003c/b\u003e allié \u003cb\u003echarge\u003c/b\u003e un personnage aligné jusqu\u0027à {cell:c} et inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\n{#PUSH} la cible de {value:v} à {cell:d}.",
   "43788": "Pluie de Crânes",
   "93411": "Inflige {magicalPowerValue:min} à {magicalDamage:max} dans la zone\\_\u003csprite name\u003dcell_around\u003e ciblée.",
   "19030": "Rafale",
   "62882": "Un allié peut rejouer son tour.\n{#REWIND}",
   "15114": "Mâchouille",
   "58893": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.",
-  "52548": "Fertilisation",
-  "74624": "Construit un {objectMechanism:451}.",
   "83243": "Hurlement du Troupeau",
   "6032": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#HERD}\\_: les \u003cb\u003eBOUFTOUS\u003c/b\u003e {#ADJACENT[ADJACENTS]!} à un ennemi déclenchent une \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "24791": "Bélier",
@@ -1044,16 +946,14 @@
   "15313": "Morsurabique",
   "2221": "Couper",
   "73386": "Inflige {magicalDamage:dmg}.\n\\---\nPlace 1 sort aléatoire du \u003cb\u003eGRIMOIRE DE PIERRE\u003c/b\u003e dans votre main.",
-  "81481": "Dépupucelage",
-  "22817": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#DEATHBLOW!}\\_: Invoque 1\\_{summoning:979}.",
   "78969": "Éruption",
   "88406": "Le VOLCAN inflige {magicalDamage:dmg} sur {magicalPowerValue:min} à {cell:max} aléatoires.\n\\---\nPose une {FloorMechanism:278} sur les cases libres.",
   "54824": "Cor Motivant",
-  "62960": "Confère +{magicalPowerValue:min} à +{attackBoost:max} aux \u003cb\u003eBworks\u003c/b\u003e.",
+  "62960": "Confère +{value:perc}% de dégâts physiques aux \u003cb\u003eBworks\u003c/b\u003e.",
   "93172": "Cor de Protection",
   "34061": "Confère +{magicalPowerValue:min} à +{armor:max} aux \u003cb\u003eBworks\u003c/b\u003e.",
   "39946": "Corde à Linge",
-  "85970": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n\\---\nConfère +{attackBoost:at} à un \u003cb\u003eBwork\u003c/b\u003e {#ANGRYDRIVE[ENRAGÉ]} pour le tour.",
+  "85970": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n\\---\nConfère +{value:at}% de dégâts physiques à un \u003cb\u003eBwork\u003c/b\u003e {#ANGRYDRIVE[ENRAGÉ]} pour le tour.",
   "67695": "Compression",
   "82647": "Inflige {magicalDamage:dmg} à un personnage autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eBwork\u003c/b\u003e et le téléporte jusqu\u0027à {cell:c}.\n\\---\nInflige ensuite {magicalDamage:dmg2} aux personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e.",
   "38388": "Cor d\u0027Effroi",
@@ -1061,11 +961,11 @@
   "88253": "Valdingue",
   "66639": "Inflige {magicalDamage:dmg} à un \u003cb\u003eBwork\u003c/b\u003e.\n\\---\nConfère +{magicalPowerValue:min} à +{armor:ar} et +{value:pm}\\_{%PM} pour le tour.",
   "76163": "Exécution",
-  "900": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}\n\\---\n+ {magicalDamage:dmg2} par \u003cb\u003eBwork\u003c/b\u003e adjacent\\_\u003csprite name\u003dcell_cross\u003e à la cible.",
+  "900": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}\n\\---\n+{magicalDamage:dmg2} par \u003cb\u003eBwork\u003c/b\u003e adjacent\\_\u003csprite name\u003dcell_cross\u003e à la cible.",
   "71162": "Complainte des bois maudits",
   "68376": "Inflige {magicalDamage:dmg}.\n{addReserve:pa}\\v si la cible est {#PARASITE[PARASITÉE]} ou {#CONTAGIOUS[CONTAGIEUSE]}.",
   "47587": "Déracinement",
-  "25822": "Inflige {magicalDamage:dmg} et repousse de {cell:c}.",
+  "25822": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.",
   "7148": "Spores mortelles",
   "41775": "Inflige {magicalDamage:dmg} \u003ccolor\u003d#3FD5D3\u003e\u003cb\u003eAUTOUR\u003c/b\u003e\u003c/color\u003e de la cible.\nApplique {#CONTAGIOUS} aux personnages touchés.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAbraknyde toxique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "57914": "Convocation Nécromique",
@@ -1080,36 +980,14 @@
   "92950": "Invoque 3 {summoning:763[TRONK\u0027NIDS]}.\nPlace le sort {spell:196} en main.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAnélide la Troncophore\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "17980": "Nutrition",
   "91134": "Détruit un {summoning:763}.\nGagne {value:ar}\\_{%ar}.\nPlace le sort {spell:437} en main.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAnélide la Troncophore\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "19468": "Charge personnelle",
-  "24834": "Un \u003cb\u003eTAURE\u003c/b\u003e \u003cb\u003echarge\u003c/b\u003e un personnage aligné\\v jusqu\u0027à {cell:c}.\nInflige son {%AT} +{magicalDamage:mult} par case parcourue.\nPiochez 1\\_sort.",
-  "85934": "Charge motivante",
-  "42298": "Un \u003cb\u003eTAURRIDA\u003c/b\u003e \u003cb\u003echarge\u003c/b\u003e un personnage aligné.\nInflige {magicalDamage:dmg}.\n+{attackBoost:DmgBoost} aux Taures {#AROUND!} de la cible\\v pour le tour.",
-  "54614": "Charge Dispersée",
-  "38148": "Un \u003cb\u003eTAURE\u003c/b\u003e \u003cb\u003echarge\u003c/b\u003e un personnage aligné.\nInflige {magicalDamage:dmg}.\n{#BOUNCE!}.",
   "57073": "Traque",
   "97580": "Applique {#ROOTED[IMMOBILISÉ]} aux adversaires à {cell:c} ou plus de votre héros.",
-  "61003": "Foncer dans le Tas",
-  "40219": "Un \u003cb\u003eTAURE\u003c/b\u003e \u003cb\u003echarge\u003c/b\u003e un personnage aligné.\nInflige {magicalDamage:dmg} et {#STUN[ASSOMME]!} la cible.",
   "24516": "Tribu Draconique",
   "52394": "Ajoute {addReserve:pa}.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "94587": "Trépignement",
-  "95010": "Téléporte un \u003cb\u003eTAURE\u003c/b\u003e d\u0027{cell:c}.\n+{attackBoost:DmgBoost} pour le tour.",
-  "41245": "Voir rouge",
-  "15943": "+{attackBoost:DmgBoost} à un \u003cb\u003eTAURE\u003c/b\u003e pour le tour.\nNon cumulable.",
-  "64317": "Baffe de taure",
-  "19250": "Confère autant d\u0027{%ar}\\v que son {%at} à un {summoning:691}.",
-  "87792": "Pet de mandhal",
-  "95626": "Confère {value:a}\\_{#FLIESAURA} à tous les \u003cb\u003eTAURES\u003c/b\u003e.",
-  "45237": "Tir de mandhal",
-  "27479": "Inflige {magicalDamage:dmg}\\v aux personnages devant \u003cb\u003eMANDHAL\u003c/b\u003e.",
-  "55643": "Lait puant",
-  "46955": "Inflige {magicalDamage:dmg}.\n+{attackBoost:DmgBoost} à un \u003cb\u003eTAURE\u003c/b\u003e pour le tour.",
-  "56120": "Lait noir",
-  "96475": "Confère {#SHIELD!}.",
+  "41245": "A corps perdu",
+  "15943": "Charge un adversaire aligné jusqu\u0027à 5 cases\\vet inflige {magicalDamage:dmg}.",
   "20686": "Catapultage",
   "95343": "Téléporte un allié jusqu\u0027à {cell:c}.\n\\---\nInflige ensuite {magicalDamage:dmg} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e.",
-  "416": "Minofrappe",
-  "54256": "Inflige {magicalDamage:dmg}\\v dans la zone \u003csprite name\u003dcell_circle2\u003e du \u003cb\u003eMINOTAUROR\u003c/b\u003e.",
   "81595": "Appel Spectral",
   "96433": "Invoque une {Summoning:898} jusqu\u0027à {cell:c} de votre héros.",
   "52145": "Catalyseur Temporel",
@@ -1119,7 +997,7 @@
   "13712": "Petite Aiguille Astrale",
   "94427": "Inflige {magicalDamage:dmg} sur les {cell:c} devant votre héros.\n\\---\nPiochez {value:s}\\_sort par adversaire touché.",
   "10742": "Carquois",
-  "12791": "Confère {value:nb}\\_{#SIGHT[MIRES]} à votre héros et 1\\_{%pm} pour le tour par \u003cb\u003eMIRE\u003c/b\u003e qu\u0027il possède.",
+  "12791": "Confère {value:nb}\\_{#SIGHT[MIRES]} à votre héros puis 1\\_{%pm} par \u003cb\u003eMIRE\u003c/b\u003e qu\u0027il possède pour le tour.",
   "26071": "Vierge de Fer",
   "47997": "Construit une {ObjectMechanism:429}\\v jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\nDétruit votre précédente {ObjectMechanism:429}.",
   "52480": "Sacrifice",
@@ -1133,9 +1011,7 @@
   "71400": "Attirance Sournoise",
   "30961": "Attire de {cell:c} un personnage aligné\\v avec votre {Summoning:120}.",
   "83384": "Désossement",
-  "14437": "Confère +{magicalPowerValue:min} à +{attackBoost:max} à 2\\_\u003cb\u003eChafers\u003c/b\u003e alliés.",
-  "11340": "Pour le Bien Commun",
-  "94055": "Sacrifie une unité alliée. \\n Ajoute {addReserve:r}.",
+  "14437": "Confère +{value:perc}% de dégâts physiques à 2\\_\u003cb\u003eChafers\u003c/b\u003e alliés.",
   "88010": "Cocon Protecteur",
   "87565": "Confère {#SHIELD} et {#UNTARGETABLE} jusqu\u0027au prochain tour allié à une invocation ou un compagnon allié.",
   "34596": "Déphasage",
@@ -1147,7 +1023,7 @@
   "225": "Restauration",
   "15766": "Inflige {magicalDamage:dmg}.\nSoigne les alliés de {heal:h}\\v si la cible est {#WET[MOUILLÉE]}\u003csprite name\u003dwet\u003e.",
   "8168": "Frayeur Salvatrice",
-  "36849": "Soigne {heal:h}\\v et repousse de {cell:c}.",
+  "36849": "Soigne {heal:h}\\v et {#PUSH} de {cell:c}.",
   "76052": "Téléporte {Companion:417} jusqu\u0027⣻à {cell:c}.\n\\---\nInflige ensuite {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "18030": "Essai de Khan Karkass",
   "1643": "Soigne les personnages alliés de {heal:h}.\n{#SUPPORT}\\_: Piochez 1\\_sort.",
@@ -1158,12 +1034,8 @@
   "97470": "Applique {frozen:PropertyEffect.26.FrozenDmg}.",
   "97218": "Déclenche le pouvoir d\u0027un de vos \u003cb\u003eLABORATOIRES\u003c/b\u003e.\nPiochez {value:d} sort.",
   "41733": "Double Régime",
-  "54734": "Chuchotement Obscur",
-  "63635": "Inflige {magicalDamage:dmg} et -1\\_{%PA} à la cible au prochain tour.",
-  "16707": "Soin mortuaire",
-  "24510": "Soigne les unités \u003cb\u003eADJACENTES\u003c/b\u003e de la valeur de l\u0027{%at} de la cible.",
-  "32850": "Déminage mortifère",
-  "11430": "Détruit un {floorMechanism:1203} et confère {value:v}\\_{#RESURRECTIONAURA} aux \u003cb\u003eCHAFERS\u003c/b\u003e \u003cb\u003eADJACENTS\u003c/b\u003e.",
+  "32850": "",
+  "11430": "",
   "42085": "Pièges Cyclones",
   "74440": "Construit 2\\_{FloorMechanism:191[PIÈGES]}\\v jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n+1\\_{%pa} à votre {%reserve} par personnages adverses entre eux s\u0027ils sont alignés.",
   "70053": "Sombre Dessein",
@@ -1174,14 +1046,12 @@
   "82608": "Téléporte un \u003cb\u003eChafer\u003c/b\u003e allié jusqu\u0027à {cell:c} et inflige {magicalPowerValue:min} à {magicalDamage:max} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "19984": "Requiem des Âmes",
   "38804": "Inflige aux adversaires le double de l\u0027{%at} du \u003cb\u003eChafer\u003c/b\u003e allié ayant le plus d\u0027{%at}.",
-  "43722": "Aidez Moi",
-  "23507": "Confère {value:pm}\\_{%pm} et {value:at}\\_{%at} à un {summoning:442} pour un tour.",
   "42047": "Frappe Bunkan",
   "67190": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.",
   "76434": "Puissance Martiale",
-  "76966": "Confère +{attackBoost:at} et +{armor:ar} à 2\\_\u003cb\u003eCochons\u003c/b\u003e alliés.\n\\---\n+{attackBoost:boost1} et +{armor:boost2} par AURA qu\u0027ils possédent.",
+  "76966": "Confère +{value:at}% de dégâts physiques et +{armor:ar} à 2\\_\u003cb\u003eCochons\u003c/b\u003e alliés.\n\\---\n+{value:boost1}% de dégâts physiques et +{armor:boost2} par AURA qu\u0027ils possédent.",
   "23875": "Fury d\u0027Elely",
-  "51233": "+{attackBoost:at} et +{value:pm}\\_{%pm} à {Companion:302} pour le tour.",
+  "51233": "+{value:at}% aux dégâts physiques et +{value:pm}\\_{%pm} à {Companion:302} pour le tour.",
   "74098": "Surcharge de Bakara",
   "49968": "Inflige {magicalDamage:dmg}.",
   "43073": "Orbe de Justice",
@@ -1195,29 +1065,15 @@
   "74754": "Surgissement",
   "28860": "Piochez {value:s}\\_sorts.",
   "38721": "Transfert Nécrotique",
-  "49208": "Inflige {magicalDamage:dmg} à un \u003cb\u003eChafer\u003c/b\u003e allié pour confèrer +{magicalPowerValue:min}\\_à\\_+{armor:max} et +{magicalPowerValue:min2}\\_à\\_{attackBoost:max2} à un autre \u003cb\u003eChafer\u003c/b\u003e allié.",
+  "49208": "Inflige {magicalDamage:dmg} à un \u003cb\u003eChafer\u003c/b\u003e allié pour confèrer +{value:min}\\_à\\_+{armor:max} et +{value:perc}% de dégâts physiques à un autre \u003cb\u003eChafer\u003c/b\u003e allié.",
   "24391": "Armée sans Fin",
   "42098": "Confère +{value:v}\\_{%bl} à un {ObjectMechanism:1447}.\n\u003cb\u003eOU\u003c/b\u003e\nConfère +{armor:ar} à un \u003cb\u003eChafer\u003c/b\u003e allié.",
-  "25961": "Ruée de Taure",
-  "50389": "Invoque un {summoning:975}\\v sur une case alignée avec un \u003cb\u003eTAURE\u003c/b\u003e.",
-  "97992": "Ruée de Taurino",
-  "82281": "Invoque un {summoning:878}\\v sur une case alignée avec un \u003cb\u003eTAURE\u003c/b\u003e.",
   "29458": "Geoperception",
   "27847": "Confère {#SHIELD}.\n\\---\nPiochez {value:v}\\_sorts.",
-  "8446": "Ruée de Mooman",
-  "93393": "Invoque une {summoning:443}\\v sur une case alignée avec un \u003cb\u003eTAURE\u003c/b\u003e.",
-  "49211": "Ruée de Prehistauric",
-  "73034": "Invoque un {summoning:691}\\v sur une case alignée avec un \u003cb\u003eTAURE\u003c/b\u003e.",
-  "45916": "Ruée de Grabataure",
-  "7056": "Invoque un {summoning:207}\\v sur une case alignée avec un \u003cb\u003eTAURE\u003c/b\u003e.",
+  "49211": "Trauma Cranien",
+  "73034": "Confère {value:pm}\\_{%pm} à un {Summoning:701} pour le tour.",
   "95667": "Page 1 du Grimoire de Feu",
   "6107": "Inflige {magicalDamage:dmg}.\n\\---\n{%CantGoToDeck}",
-  "11935": "Gorgée de lait",
-  "25464": "Soigne {heal:h}.\n{%CantGoToDeck}",
-  "62045": "Prélèvement",
-  "70137": "Inflige {magicalDamage:dmg}.\nSi le sort achève un \u003cb\u003eBouftou Parasité ou Dégénéré\u003c/b\u003e, fait avancer la Science.\n{#REWIND}",
-  "5535": "Raccourcissement",
-  "99548": "Tond un {summoning:663} adjacent à {summoning:623}.\n{#COMBO}\\_: Renvoie ce sort dans votre main.",
   "58821": "Chuchotement Strident",
   "57837": "Inflige {magicalPowerValue:min} à {magicalDamage:max} et applique {#WHISPERED}.",
   "946": "Pluie de Flèches",
@@ -1226,78 +1082,34 @@
   "44585": "Un allié charge un adversaire aligné\\v jusqu\u0027à {cell:c} et lui inflige son {%at}.\nPasse en {#OFFENSIVESTANCE}.",
   "60474": "Saut Stratégique",
   "92534": "Téléporte un allié jusqu\u0027à {cell:c}\\v et le passe en {#OFFENSIVESTANCE}.",
-  "11299": "Graine de Lierre",
-  "81146": "Fait pousser un {objectMechanism:810}.",
-  "42685": "Morsure",
-  "6017": "Inflige {magicalDamage:dmg}.",
   "67490": "Orage en Mer",
   "45195": "Inflige {magicalPowerValue:min} à {magicalDamage:max}\\vaux adversaires {#ELECTRIFIED[Électrifiés]}.",
-  "55239": "Coup Puissant",
-  "7444": "Inflige {magicalDamage:dmg}.",
-  "28875": "Choc Bestial",
-  "60414": "Inflige {magicalDamage:dmg}.",
-  "3982": "Soin Animal",
-  "42467": "Soigne {heal:h}.",
-  "56718": "Cocon",
-  "65667": "+{armor:ar}.",
-  "6872": "Soin Animal",
-  "25312": "Confère {#SHIELD}.",
-  "64121": "Choc Bestial",
-  "97107": "Inflige {magicalDamage:dmg} et applique {#ROOTED[IMMOBILISÉ]}.",
   "55763": "Piège",
   "78699": "Construit un {FloorMechanism:191}\\v jusqu\u0027à {mechanismSpawnRange:c} de votre héros.",
   "95": "Viens par la toi",
   "40313": "Inflige {magicalDamage:dmg}\\v à un personnage aligné avec votre héros et l\u0027attire.",
   "18255": "Pièges à Loup",
   "14996": "Construit 2\\_{FloorMechanism:191[PIÈGES]}\\v jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\nApplique {fractured:PropertyEffect.42.FracturedDmg} aux personnages entre eux s\u0027ils sont alignés.",
-  "838": "Stimulant Tauride",
-  "36566": "Déclenche l\u0027{#ALIGNMENT} du \u003cb\u003eTAURE\u003c/b\u003e ciblé.",
-  "82663": "Rage de Mandhal",
-  "85649": "Déclenche l\u0027{#ALIGNMENT} de tous les \u003cb\u003eTAURES\u003c/b\u003e.",
   "95295": "Invoque un {Summoning:238} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un \u003cb\u003eChafer\u003c/b\u003e allié.\n\\---\nCe sort est détruit quand il est joué.",
   "26342": "Avorton",
-  "8661": "Excavation",
-  "72191": "Construit un {objectMechanism:569} sur une case {#ADJACENT[ADJACENTE]!} à un {summoning:702}.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eCraqueleur Orné\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "40334": "Lancer de Rocher",
-  "94242": "Détruit un {#CRAQUELOROC} \u003ccolor\u003d#3FD5D3\u003e\u003cb\u003eAUTOUR\u003c/b\u003e\u003c/color\u003e d\u0027un {summoning:577} et inflige son {%BL} + {magicalDamage:dmg} à un adversaire.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eFracasseur\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "92847": "Renvoi dans les cordes",
   "89572": "Inflige {magicalDamage:dmg} et renvoie la cible sur le bord opposé du terrain.",
   "71790": "Arak-hiri",
   "42924": "Invoque 2 {summoning:9[ARAKNES]} sur les cases adjacentes à la cible.\nSi {summoning:797} a moins de 50% de {%pv}, invoque 1 {summoning:285} à la place.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAraknode l\u0027Indésirable\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "36412": "Détruit un {objectMechanism:1044} et inflige son {%bl} aux adversaires {#AROUND!}.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eCraquelanceur\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "45662": "Rocher Piégé",
-  "36074": "Rocanon",
-  "44642": "Inflige {magicalDamage:dmg}.",
-  "34728": "Attache Terrestre",
-  "68088": "Inflige {magicalDamage:dmg} à un adversaire aligné avec un Craqueleur et l\u0027attire de {cell:c}.",
-  "39348": "Croque-Roche",
-  "39276": "Détruit un {#CRAQUELOROC} {#AROUND!} d\u0027un {summoning:346} et confère en {%AR} son {%BL} +\\_{value:v}.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eCroqueur\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "14262": "Fracasse",
-  "22553": "Inflige {magicalDamage:dmg} aux adversaires dans la zone ciblée \u003csprite name\u003dcell_around\u003e sur une case {#ADJACENT[ADJACENTE]!} à un {summoning:577}.",
   "79616": "Course",
-  "68305": "Confère {value:pm}\\_{%pm} à un allié pour le tour.",
-  "22850": "Montée des Eaux",
-  "11881": "Inflige {magicalDamage:dmg} et applique {#WET!} à tous les adversaires.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eCraquemousse\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "68305": "Confère {value:pm}\\_{%pm} pour le tour à un allié.",
   "45414": "Inflige {magicalDamage:dmg} par {#AURA[AURAS]!} ou {#SIGHT[MIRES]!}\\v de la cible puis les retire.",
   "26913": "Vile Négation",
   "20545": "Monolithe Occulte",
   "87594": "Invoque un {ObjectMechanism:732}.",
-  "87269": "Destruction Mécanique",
-  "6589": "Détruit tous les pièges et mécanismes adverses.",
-  "45263": "Explosion Cristaline",
-  "45347": "Détruit un {objectMechanism:569} et inflige son {%bl} aux adversaires alignés.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eMinerai Animé\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "2901": "Ensevelissement",
-  "12179": "Inflige {magicalDamage:dmg}.",
+  "87269": "Zodiac",
+  "6589": "Applique {#astral}.\n\\---\n{%CantGoToDeck}",
   "93383": "Régurgitation",
   "8650": "Inflige {magicalDamage:dmg}.\nInflige {magicalDamage:xdmg} supplémentaires si la cible est alignée.\nPlace le sort {spell:889} en main.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAnélide la Troncophore\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "41591": "Déflagration",
   "81382": "Inflige {magicalDamage:dmg} autour de la cible.\nPlace le sort {spell:203} dans la main.\n\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eAnélide la Troncophore\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "90700": "Aerovue",
-  "12489": "Repousse de {cell:c}.\n\\---\nPiochez {value:v}\\_sort.",
-  "53017": "Fer Rouge",
-  "4078": "Pose une {floorMechanism:113} (Max 5).",
-  "62982": "Reconstitution Labyrinthique",
-  "96206": "Téléporte jusqu\u0027à trois personnages entre les deux {floorMechanism:113} ciblées.",
+  "12489": "{#PUSH} de {cell:c}.\n\\---\nPiochez {value:v}\\_sort.",
   "37109": "Mutation",
   "79053": "Invoque des {objectMechanism:405[BOUTS DE BOIS POURRI]} sur les cases adjacentes à la cible.\nPlace le sort {spell:332} en main.",
   "81868": "Chuchotement Perçant",
@@ -1306,28 +1118,14 @@
   "11355": "Inflige {magicalDamage:dmg} sur les cases devant votre héros.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "84380": "Éclatement Cristalin",
   "20269": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg} {#AROUND!}\\vd\u0027un {ObjectMechanism:201} puis le détruit.",
-  "42922": "Soubresaut",
-  "11891": "Inflige {magicalDamage:dmg}\\_et repousse de {cell:c}.",
-  "60570": "Démangeaison",
-  "94217": "Inflige {magicalDamage:dmg}.",
   "73964": "Page 1 du Grimoire des Vents",
   "19152": "Inflige {magicalDamage:dmg}.\n\\---\n{%CantGoToDeck}",
-  "64743": "Maléfice venteux",
-  "6354": "Inflige {magicalDamage:dmg}.\nPiochez un sort si la cible est {#VENTILATED[ÉVENTÉE]}\u003csprite name\u003dventilated\u003e.",
-  "41737": "Maléfice combustible",
-  "65541": "Inflige {magicalDamage:dmg}\n\u003cb\u003eOU\u003c/b\u003e\n{lifesteal:dmg} si la cible est {#OILED[HUILÉE]}\u003csprite name\u003doiled\u003e.",
-  "28842": "Craq\u0027mation",
-  "69124": "Transforme la cible en \u003cb\u003eCRAQUELEUR\u003c/b\u003e.\n\u003cb\u003eCRAQUELEUR\u003c/b\u003e : {attackBoost:at} et {value:pm}\\_{%pm}.",
-  "3716": "Kata initiatique",
-  "55844": "Gagne {value:at}\\_{%at} pour le tour.",
   "19181": "Flux Aqueux",
   "40865": "Inflige {magicalDamage:dmg}\\v+{magicalDamage:boost} par autre sort EAU\u003csprite name\u003dwater\u003e dans votre main.\n\\---\n{#COMBO} : {#REWIND}",
-  "30093": "Attaque Monstrueuse",
-  "28287": "Inflige {magicalDamage:dmg}.",
   "50052": "Explosion Tellurique",
   "50047": "Requiert 3 {ObjectMechanism:201} pour être lancé.\n\\---\nInflige {magicalPowerValue:min} à {magicalDamage:dmg} {#AROUND!} de chaque\\v {ObjectMechanism:201} puis les détruit.",
   "60632": "Fouetté de Lou",
-  "56502": "+{attackBoost:at} à un allié pour le tour et piochez {value:s}\\_sort.",
+  "56502": "+{value:at}% aux dégâts physiques à un allié pour le tour et piochez {value:s}\\_sort.",
   "59538": "Morsure de Lilotte",
   "15492": "Inflige {magicalDamage:dmg} et applique l\u0027état {#MUDDY}.",
   "62998": "Protection de Jahash",
@@ -1336,10 +1134,6 @@
   "59363": "Inflige {magicalDamage:dmg}.\n{#bounce}",
   "61467": "Frappe de Percimol",
   "42095": "Téléporte {Companion:34} jusqu\u0027à {cell:c}.\n\\---\nInflige ensuite {magicalDamage:dmg} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.",
-  "31907": "C\u0027est Toi le Meilleur !",
-  "5630": "+{value:v}\\_{%AT} pour le tour.\n{%CantGoToDeck}",
-  "96795": "Je Crois en Toi !",
-  "34092": "Soigne de {heal:h}.\n{%CantGoToDeck}",
   "49698": "Aspiration Tellurique",
   "46103": "+{armor:ar} aux alliés {#AROUND!} d\u0027un {ObjectMechanism:201} puis le détruit.",
   "47233": "Barrière Magique",
@@ -1348,44 +1142,14 @@
   "49571": "Inflige {magicalPowerValue:min} à {magicalDamage:max} et Applique {#ROOTED[IMMOBILISÉ]}.",
   "705": "Applique l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.\n\\---\n{%CantGoToDeck}",
   "58382": "Page 3 du Grimoire de Feu",
-  "27669": "Chuchotement Strident",
-  "15445": "Inflige {magicalDamage:dmg}.",
-  "91022": "Barrière Magique",
-  "48586": "Confère {#UNTARGETABLE}.",
   "42670": "Souffle Draconique",
-  "72846": "Inflige {magicalDamage:dmg}.\n\\---\nRepousse d\u0027une case par sort \u003cb\u003eDraconique\u003c/b\u003e équipé.\n\\---\nPiochez un sort \u003cb\u003eDraconique\u003c/b\u003e si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "84966": "Reprise de Souffle",
-  "53465": "Soigne de {heal:h} si aucun advesaire n\u0027est {#AROUND!}.",
-  "19040": "Attaque Désespérée",
-  "85758": "Inflige {magicalDamage:dmg}.",
-  "12848": "Charge Ténébreuse",
-  "8084": "Votre héros \u003cb\u003echarge\u003c/b\u003e un personnage aligné\n\\---\nInflige {magicalDamage:dmg} +{value:mult} par case parcourue.\n\\---\n{#DEATHBLOW}\\_: Ajoute deux fois le sort {spell:65351} à votre main.",
-  "20297": "Tour 2",
-  "95180": "",
-  "95499": "Rassemblement d\u0027Évadés",
-  "90362": "Rassemble les évadés.",
-  "24274": "Attaque Kamikaze",
-  "96104": "Inflige {magicalDamage:dmg}.\nRéduit les {%PV} du lanceur à 1.",
-  "19320": "Concentration",
-  "20174": "{addReserve:v}.",
-  "89071": "Posture Défensive",
-  "1259": "Confère {#RIPOSTE}({value:v}) jusqu\u0027au début du prochain tour.",
-  "35085": "Jet de Fukumibari",
-  "4133": "Inflige {magicalDamage:dmg} à un personnage aligné avec un allié.",
-  "98559": "Shinobi Aruki",
-  "7799": "Téléporte un allié autour de la {summoning:864}.",
-  "68310": "Arcanes du sabot ancestral",
-  "68251": "Inflige {magicalDamage:dmg} aux {cell:c} devant la {summoning:448}.",
+  "72846": "Inflige {magicalDamage:dmg}.\n\\---\n{#PUSH} d\u0027une case par sort \u003cb\u003eDraconique\u003c/b\u003e équipé.\n\\---\nPiochez un sort \u003cb\u003eDraconique\u003c/b\u003e si la cible a l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "45723": "Cage de Kofman",
   "52186": "Place une {FloorMechanism:126} en jeu\\v \u003cb\u003eAUTOUR\u003c/b\u003e de {Companion:496}.",
   "76447": "Flammèche Ardente",
   "83519": "Lance 1 flammèche qui inflige {magicalDamage:dmg} à un adversaire aléatoire.\n\\---\n+1\\_flammèche par autre sort FEU\u003csprite name\u003dfire\u003e dans votre main.",
-  "62385": "Colère Noire",
-  "53630": "Le Chevalier Noir passe en {#DEFENSIVESTANCE}",
   "27537": "Champion de la Lune",
-  "91153": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.360.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\n{#DEATHBLOW!}\\_: Ajoute le sort {Spell:65351!} à votre main.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_{#CHAMPIONAURA[AURA CHAMPION]}",
-  "60235": "Eboulement",
-  "47398": "Inflige {magicalDamage:dmg} {#AROUND} de la cible.\nLe Chevalier Noir passe en {#CONTROLSTANCE}.",
+  "91153": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.360.perc}% aux dégâts magiques et physiques\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA[AURAS CHAMPION]}\n\\---\n{#DEATHBLOW}\\_: Applique {frozen:PropertyEffect.26.FrozenDmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_{#CHAMPIONAURA}.",
   "35114": "Invoque 2\\_{Summoning:979[PUPUCES]} {#AROUND!} du \u003cb\u003eBOUFTOU\u003c/b\u003e ciblé.",
   "50195": "Pupulence",
   "96006": "Ame en Peine",
@@ -1400,42 +1164,22 @@
   "19981": "Regret du Défunt",
   "65590": "Téléporte un personnage allié de {cell:c}.",
   "18616": "Tunnel d\u0027un Autre Monde",
-  "93758": "Instincts maternels",
-  "3824": "Soigne les alliés de {heal:h}.\nSi la cible est à côté d\u0027un \u003cb\u003eBOUFTON\u003c/b\u003e, il est ramené dans l\u0027équipe et le sort est replacé dans la main.",
+  "93758": "Bouclier Vaillant",
+  "3824": "Confère {#SHIELD} à un allié.\n\\---\n{%CantGoToDeck}",
   "83903": "Échange la place de votre fantôme avec celle d\u0027un allié.",
   "82431": "Dans de Sales Draps",
-  "56575": "Coup de Gantelet",
-  "15439": "Inflige {magicalDamage:dmg}.",
-  "34306": "Polissage",
-  "82102": "Défausse 1 sort aléatoire.\nPiochez 2 sorts.",
-  "24351": "Scintillement",
-  "83173": "Téléporte le FORGERON jusqu\u0027à {cell:c}.",
-  "46416": "Reluisance",
-  "1206": "Confère {armor:ar}.",
-  "62436": "Matelassage",
-  "40951": "Confère {#SHIELD}.",
-  "33047": "Heaume d\u0027Acier",
-  "74111": "Réduit les dégâts subis de 10\\v jusqu\u0027au prochain tour.",
-  "19730": "Couvaison",
-  "8659": "Retire une \u003cb\u003eCOQUILLE\u003c/b\u003e à la cible.",
+  "34306": "Voyage voyage",
+  "82102": "Téléporte un personnage de {cell:c}.\n\\---\n{%CantGoToDeck}",
   "63805": "Souffle des Dragoeufs",
   "73725": "Inflige {magicalDamage:dmg}.\nDéclenche un effet supplémentaire si la cible possède un état élémentaire.",
   "99403": "Protect\u0027Oeuf",
   "68453": "+{armor:ar} aux {#DRAGEGG}.",
   "33083": "Eject\u0027Oeuf",
-  "23048": "Les {#DRAGEGG} repoussent les adversaires {#ADJACENT!} de {cell:c}.",
+  "23048": "Les {#DRAGEGG}, {#PUSH[REPOUSSENT]} les adversaires {#ADJACENT!} de {cell:c}.",
   "96693": "Bomb\u0027Oeuf",
   "81218": "Les {#DRAGEGG} déclenchent {explosion:ex!}.",
   "91989": "Bouclier Chafer",
   "39513": "Confère {#SHIELD} à un \u003cb\u003eChafer\u003c/b\u003e allié et aux alliés autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
-  "5549": "Boost Musculaire",
-  "65371": "+{attackBoost:at} et +{value:PM}\\_{%pm} à un allié pour le tour.\n{%CantGoToDeck}",
-  "30474": "Fontaine de Jouvence",
-  "2481": "Soigne {heal:h}\\v et retire l\u0027état élémentaire.\n{%CantGoToDeck}",
-  "12454": "Armure de Jade",
-  "39124": "+{armor:ar} et {#SHIELD} à un allié.\n{%CantGoToDeck}",
-  "77056": "Appel du Loup",
-  "43549": "Invoque un {summoning:212}\\v jusqu\u0027à {cell:c} de votre héros.\n{%CantGoToDeck}",
   "93841": "Ouvrir les Tombes",
   "24820": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nAjoute {addReserve:pa} si la cible a l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
   "39364": "Petite Nécrose",
@@ -1460,8 +1204,6 @@
   "70448": "Sacrifie un \u003cb\u003eChafer\u003c/b\u003e allié pour qu\u0027il inflige deux fois son {%at} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "17638": "Damnation",
   "38570": "Applique {frozen:PropertyEffect.26.FrozenDmg} dans la zone \u003csprite name\u003dcell_cross\u003e ciblée.",
-  "8292": "Avorton",
-  "22683": "Invoque un {summoning:238} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un \u003cb\u003eChafer\u003c/b\u003e allié.",
   "64333": "Ossuaire",
   "57620": "Invoque un {ObjectMechanism:1447}.",
   "50294": "Coup Plongé",
@@ -1479,7 +1221,7 @@
   "62107": "Cor d\u0027Agression",
   "55808": "Les \u003cb\u003eBworks\u003c/b\u003e déclenchent leur \u003cb\u003eATTAQUE\u003c/b\u003e sur un adversaire adjacent\\_\u003csprite name\u003dcell_cross\u003e.",
   "72448": "Séisme",
-  "98897": "Repousse tous les personnages de {value:cmin} à {cell:cmax} dans une direction aléatoire.",
+  "98897": "{#PUSH} tous les personnages de {value:cmin} à {cell:cmax} dans une direction aléatoire.",
   "54585": "Explosion de Magma",
   "84508": "Le VOLCAN inflige {magicalDamage:dmg} dans la zone \u003csprite name\u003dcell_cross\u003e ciblée.\n\\---\nPose une {FloorMechanism:278} sur les cases libres.",
   "14719": "Coulée de Lave",
@@ -1539,9 +1281,9 @@
   "57374": "Charge Cochonne",
   "70114": "Un \u003cb\u003eCochon\u003c/b\u003e allié \u003cb\u003echarge\u003c/b\u003e un adversaire jusqu\u0027à {cell:c} et lui inflige son {%at}.",
   "65129": "Flatulence",
-  "57240": "Inflige {value:min} à {magicalDamage:max}.\n\\---\nRepousse de {cell:c}.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC}.",
+  "57240": "Inflige {value:min} à {magicalDamage:max}.\n\\---\n{#PUSH} de {cell:c}.",
   "42236": "Flatulence de Masse",
-  "62707": "Les \u003cb\u003eCochons\u003c/b\u003e alliés infligent {magicalPowerValue:min} à {magicalDamage:max} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e d\u0027eux et repoussent ceux adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC}.",
+  "62707": "Les \u003cb\u003eCochons\u003c/b\u003e alliés infligent {magicalPowerValue:min} à {magicalDamage:max} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e d\u0027eux et {#PUSH[REPOUSSENT]} ceux adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.",
   "45747": "Petit Rôt",
   "22218": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nAugmente le coût du prochain sort adverse de +{value:pa}\\_{%pa}.",
   "31567": "Répugnante Punition",
@@ -1557,7 +1299,7 @@
   "37945": "Transfert de Ki",
   "17702": "Inflige {magicalPowerValue:min} à {magicalDamage:max} à un adversaire qui a l\u0027état \u003cb\u003eBATSU\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e pour soigner un \u003cb\u003eCochon\u003c/b\u003e allié d\u0027autant.",
   "86685": "Pied de Porc",
-  "34564": "Inflige {magicalPowerValue:min} à {magicalDamage:max} à un adversaire adjacent\\_\u003csprite name\u003dcell_cross\u003e à un \u003cb\u003eCochon\u003c/b\u003e allié et le repousse de {cell:c} s\u0027il a l\u0027état \u003cb\u003eBATSU\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC}.",
+  "34564": "Inflige {magicalPowerValue:min} à {magicalDamage:max} à un adversaire adjacent\\_\u003csprite name\u003dcell_cross\u003e à un \u003cb\u003eCochon\u003c/b\u003e allié et le {#PUSH} de {cell:c} s\u0027il a l\u0027état \u003cb\u003eBATSU\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
   "47757": "Bushi Shon",
   "15199": "Libère les AURAS du \u003cb\u003eCochon\u003c/b\u003e allié ciblé pour gagner autant de {%pa} dans la {%reserve} et piocher des sorts d\u0027une valeur égale.",
   "86022": "Voie du Porshido",
@@ -1565,7 +1307,7 @@
   "64018": "Déluge de Coups",
   "93935": "Les \u003cb\u003eCochons\u003c/b\u003e alliés déclenchant un {#CRITICAL} ce tour peuvent rejouer une fois.",
   "85217": "Pour l\u0027Honneur !",
-  "65341": "Confère +{magicalPowerValue:min} à +{attackBoost:max} à 2\\_\u003cb\u003eCochons\u003c/b\u003e alliés.",
+  "65341": "Confère +{value:perc}% de dégâts physiques à 2\\_\u003cb\u003eCochons\u003c/b\u003e alliés.",
   "90911": "Ninportsu",
   "82832": "Téléporte un \u003cb\u003eCochon\u003c/b\u003e allié sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un adversaire.\n\\---\nIl déclenche un {#CRITICAL} si la cible a l\u0027état \u003cb\u003eBATSU\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
   "98899": "Appel des Ninjadines",
@@ -1575,7 +1317,7 @@
   "3198": "Rapadura",
   "78263": "Soigne {magicalPowerValue:min} à {heal:h}\n+{heal:h2} si la cible est sur une case sucrée.",
   "56306": "Tagada",
-  "2454": "+{magicalPowerValue:min} à +{value:at}\\_{%AT} aux alliés en zone \u003csprite name\u003dcell_cross/\u003e centrée sur une case sucrée.",
+  "2454": "+{value:perc}% de dégâts physiques aux alliés en zone \u003csprite name\u003dcell_cross/\u003e centrée sur une case sucrée.",
   "36789": "Zest",
   "40478": "Téléporte un allié sur une case {#AROUND} d\u0027un allié.\nInflige {magicalDamage:dmg} aux adversaires {#AROUND!} \\vet soigne de {heal:h} les alliés {#AROUND!}.",
   "91712": "Épées Funestes",
@@ -1593,15 +1335,15 @@
   "65620": "Grisette",
   "70877": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg} aux adversaires sur des cases sucrées.",
   "37352": "Fermentation",
-  "39003": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n+{attackBoost:at} à un allié {#AROUND} de la cible.",
+  "39003": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n+{value:at}% de dégâts physiques à un allié {#AROUND} de la cible.",
   "94832": "Sirop",
-  "45161": "+{magicalPowerValue:min} à +{value:at}\\_{%AT} aux alliés sur des cases sucrées.",
+  "45161": "+{value:perc}% de dégâts physiques aux alliés sur des cases sucrées.",
   "32848": "Double Dose",
   "36534": "Fusionne une \u003cb\u003eGELÉE\u003c/b\u003e avec une \u003cb\u003eGELÉE\u003c/b\u003e {#AROUND} d\u0027elle en {Summoning:166}.",
   "19492": "Sottise",
   "18010": "Invoque une \u003cb\u003eGELBIBI\u003c/b\u003e de couleur aléatoire {#AROUND} d\u0027un allié.",
   "91027": "Gelexplosion",
-  "47125": "Un allié déclenche {explosion:ex} et repousse les personnages {#ADJACENT[ADJACENTS]} de {cell:c}.",
+  "47125": "Un allié déclenche {explosion:ex} et {#PUSH} les personnages {#ADJACENT[ADJACENTS]} de {cell:c}.",
   "41141": "Pastille",
   "68444": "Soigne de {magicalPowerValue:min} à {heal:h} les alliés en zone \u003csprite name\u003dcell_cross/\u003e centrée sur une case sucrée.",
   "13627": "Pulpe",
@@ -1623,26 +1365,20 @@
   "26136": "Chomp",
   "75256": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.",
   "568": "Force du Nombre",
-  "6202": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#HERD}\\_: Confère +{attackBoost:at} aux \u003cb\u003eBOUFTOUS\u003c/b\u003e.",
+  "6202": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#HERD}\\_: Confère +{value:at}% de dégâts physiques aux \u003cb\u003eBOUFTOUS\u003c/b\u003e.",
   "70021": "Bêle et Rebêle",
   "2976": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#HERD}\\_: {addReserve:r}.",
   "55214": "Piétinement",
   "34614": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#HERD}\\_: Double les dégâts.",
   "69690": "Force Nécromique",
-  "85956": "Confère +{attackBoost:at} pour le tour.\n\\---\nLes autres \u003cb\u003eNécromes\u003c/b\u003e alliés gagnent +{attackBoost:at2} pour le tour.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "91316": "Rutection",
-  "15278": "Confère 2\\_{#COURTSHIPS[PARADES NUPTIALES]}.",
+  "85956": "Confère +{value:at}% aux dégâts physiques pour le tour.\n\\---\nLes autres \u003cb\u003eNécromes\u003c/b\u003e alliés gagnent +{value:at2}% aux dégâts physiques pour le tour.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "21832": "Démonstration de Force",
   "14482": "Un \u003cb\u003eBOUFTOU\u003c/b\u003e rejoue son tour.",
-  "11232": "Tromperie",
-  "79008": "+{attackBoost:atmin} à {attackBoost:atmax} à un \u003cb\u003eBOUFTOU\u003c/b\u003e qui possède des {#COURTSHIPS[PARADES NUPTIALES]}.\nTransfère ses {#COURTSHIPS[PARADES NUPTIALES]} à un autre \u003cb\u003eBOUFTOU\u003c/b\u003e.",
   "53977": "Démence",
-  "9472": "Confère +{value:atmin} à +{attackBoost:atmax} à un \u003cb\u003eBOUFTOU\u003c/b\u003e.\nDonne une {Spell:104!} aux ennemis {#ADJACENT[ADJACENTS]!}.",
-  "65499": "+{attackBoost:atmin} à {attackBoost:atmax} à un \u003cb\u003eBOUFTOU\u003c/b\u003e.\nInflige {magicalDamage:dmg} et {#TRANSMISSION} s\u0027il est {#SICK}.",
-  "78307": "Mutation Douloureuse",
+  "9472": "Confère +{value:perc}% de dégâts physiques à un \u003cb\u003eBOUFTOU\u003c/b\u003e.\nDonne une {Spell:104!} aux ennemis {#ADJACENT[ADJACENTS]!}.",
   "90719": "Inflige {magicalPowerValue:min} à {magicalDamage:max} à un \u003cb\u003eBOUFTOU\u003c/b\u003e\\v et {#AROUND!} de lui.\nDonne une {Spell:104!} aux ennemis {#ADJACENT[ADJACENTS]!}.",
   "16619": "Pandémie",
-  "90614": "+{value:atmin} à {attackBoost:atmax} au \u003cb\u003eBOUFTOU\u003c/b\u003e ciblé et ceux {#AROUND!}.\nDonne une {Spell:104!} aux ennemis {#ADJACENT[ADJACENTS]!}.",
+  "90614": "+{value:perc}% de dégâts physiques au \u003cb\u003eBOUFTOU\u003c/b\u003e ciblé et ceux {#AROUND!}.\nDonne une {Spell:104!} aux ennemis {#ADJACENT[ADJACENTS]!}.",
   "48450": "Hystérie Massive",
   "78574": "Transforme un \u003cb\u003eBOUFTOU\u003c/b\u003e {#SICK!}\\v en {Summoning:567}.\nDonne une {Spell:104!} aux ennemis {#ADJACENT[ADJACENTS]!}.",
   "79486": "Folie Contagieuse",
@@ -1652,16 +1388,12 @@
   "33475": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\nApplique {#ROOTED[IMMOBILISÉ]} si la cible est {#PARASITIZED[PARASITÉE]} \u003csprite name\u003dgeneric_monster\u003e.",
   "30076": "Parasitage",
   "82087": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\nDonne une {Spell:104} si la cible est {#PARASITIZED[PARASITÉE]} \u003csprite name\u003dgeneric_monster\u003e.",
-  "80123": "Attirance Sanguine",
-  "92194": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\nAttire les \u003cb\u003eBOUFTOUS\u003c/b\u003e alignés\\vsi la cible est {#PARASITIZED[PARASITÉE]} \u003csprite name\u003dgeneric_monster\u003e.",
   "66722": "Antipupuce",
   "54218": "Inflige {magicalDamage:min} par {Summoning:979} aux personnages {#PARASITIZED[PARASITÉS]}\\_\u003csprite name\u003dgeneric_monster\u003e et sacrifie les {Summoning:979[PUPUCES]}.",
   "10055": "Broutage",
-  "48221": "Déplace en ligne un \u003cb\u003eBOUFTOU\u003c/b\u003e de {cell:c}\\vet lui confère +{attackBoost:at}.",
+  "48221": "Déplace en ligne un \u003cb\u003eBOUFTOU\u003c/b\u003e de {cell:c}\\vet lui confère +{value:at}% de dégâts physiques.",
   "48941": "Invasion",
   "58682": "Les {Summoning:979[PUPUCES]} rejouent leur tour.",
-  "39685": "Sauve-Qui-Poux",
-  "98495": "Inflige {value:dmgmin} à {magicalDamage:dmgmax}.\nLes \u003cb\u003eBOUFTOUS\u003c/b\u003e {#ADJACENT[ADJACENTS]!}\\vreculent de {value:cmin} à {cell:cmax}.",
   "79271": "Festin",
   "8469": "Les \u003cb\u003eBOUFTOUS\u003c/b\u003e {#ADJACENT[ADJACENTS]!} à la cible\\vdéclenchent leur \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "1830": "Choc Fiévreux",
@@ -1669,15 +1401,15 @@
   "2524": "Nuage Électrique",
   "57564": "Applique {#ELECTRIFIED} aux adversaires\\vdans la zone \u003csprite name\u003dcell_around\u003e ciblée.",
   "2982": "Vague Fracassante",
-  "12134": "Inflige {magicalDamage:dmg} et repousse de {cell:c}.",
+  "12134": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.",
   "55908": "Bwarggg",
-  "94903": "+{attackBoost:at} et +1\\_{%PM} aux \u003cb\u003eBWORKS\u003c/b\u003e {#ANGRYDRIVE[ENRAGÉS]} pour le tour.",
+  "94903": "+{value:at}% de dégâts physiques et +1\\_{%PM} aux \u003cb\u003eBWORKS\u003c/b\u003e {#ANGRYDRIVE[ENRAGÉS]} pour le tour.",
   "84660": "Cor d\u0027Abordage",
   "4571": "Inflige {magicalDamage:dmg} aux adversaires\n+{magicalDamage:dmg2} par adversaires sans alliés {#AROUND} de lui.",
   "92707": "Cheap Shot",
   "66835": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}\n\u003cb\u003eOU\u003c/b\u003e\nInflige {magicalPowerValue:min2} à {magicalDamage:dmg2} si la cible est {#BATTERED}.",
   "22566": "Arm Drag",
-  "93749": "Le Gardien charge un personnage aligné et le repousse de {cell:c}.\nLe Gardien suit la cible après la repousse.",
+  "93749": "Le Gardien charge un personnage aligné et le {#PUSH} de {cell:c}.\nLe Gardien suit la cible après ce déplacement.",
   "88218": "Dégazage",
   "32452": "Les {FloorMechanism:278[FLAQUES DE LAVE]} déclenchent {explosion:ex}.",
   "28990": "Fissure",
@@ -1697,7 +1429,7 @@
   "81366": "Furtivité",
   "90271": "Confère {#UNTARGETABLE!} à un allié\\vjusqu\u0027au prochain tour allié.",
   "19898": "Empty path",
-  "79148": "Inflige 10 dégâts à un adversaire aligné avec votre héros.",
+  "79148": "",
   "26710": "Fuite",
   "5739": "Téléporte un allié jusqu\u0027à {cell:c}\\v et le soigne de {value:heal} à {heal:HEAL}.\nIl prend son {#AIRBORNE[envol]} si possible.",
   "74149": "Cataplumage",
@@ -1707,7 +1439,7 @@
   "26435": "Frappe éclair",
   "92697": "L\u0027allié ciblé effectue un \u003cb\u003eATTERRISSAGE BRUTAL\u003c/b\u003e s\u0027il est {#AIRBORNE}.\nSinon +2\\_{%pm} pour le tour.",
   "19457": "Tomber sur sa Proie",
-  "85983": "Un allié effectue un \u003cb\u003eATTERRISSAGE BRUTAL\u003c/b\u003e\\v si possible.\nIl repousse les personnages {#ADJACENT[ADJACENTS]}\\v de {cell:c}.",
+  "85983": "Un allié effectue un \u003cb\u003eATTERRISSAGE BRUTAL\u003c/b\u003e\\v si possible.\nIl {#PUSH} les personnages {#ADJACENT[ADJACENTS]}\\v de {cell:c}.",
   "82910": "Coup de Vent",
   "40193": "Inflige {value:dmg} à {magicalDamage:DMG}.",
   "59946": "Élan",
@@ -1715,7 +1447,7 @@
   "12504": "Explosion Guanomique",
   "70106": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\nDouble les dégâts s\u0027il y a au moins 3 alliés {#AIRBORNE[ENVOLÉS]}.",
   "36633": "Deuxième volée",
-  "96593": "+{attackBoost:at} pour le tour à l\u0027allié ciblé.\nIl effectue un \u003cb\u003eATTERRISSAGE BRUTAL\u003c/b\u003e s\u0027il est {#AIRBORNE}.",
+  "96593": "+{value:at}% de dégâts physiques pour le tour à l\u0027allié ciblé.\nIl effectue un \u003cb\u003eATTERRISSAGE BRUTAL\u003c/b\u003e s\u0027il est {#AIRBORNE}.",
   "66442": "Déplumé",
   "6061": "Applique {#FEATHERED} \u003csprite name\u003dgeneric_monster\u003e.",
   "39622": "Attaques en piqué",
@@ -1727,7 +1459,7 @@
   "11853": "Bombardement",
   "83993": "Inflige {value:dmg} à {magicalDamage:DMG} aux adversaires.\nDouble les dégâts s\u0027ils sont {#FEATHERED[PLUMÉS \u003csprite name\u003dgeneric_monster/\u003e]}.",
   "67715": "Chair de poule",
-  "44130": "Inflige {value:dmg} à {magicalDamage:DMG} à un adversaire {#ADJACENT!} à un allié.\nRepousse de {cell:c} la cible si elle est {#FEATHERED[PLUMÉE \u003csprite name\u003dgeneric_monster/\u003e]}.",
+  "44130": "Inflige {value:dmg} à {magicalDamage:DMG} à un adversaire {#ADJACENT!} à un allié.\n{#PUSH} de {cell:c} la cible si elle est {#FEATHERED[PLUMÉE \u003csprite name\u003dgeneric_monster/\u003e]}.",
   "71672": "Couvée",
   "77631": "Piochez 1 sort par allié {#AIRBORNE}.",
   "53382": "Éclosion surprise",
@@ -1742,7 +1474,7 @@
   "25740": "Deux alliés infligent {value:dmg} à {magicalDamage:DMG} aux adversaires qui leur sont {#ADJACENT[ADJACENTS]}.",
   "49639": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.",
   "41084": "Frappe Préventive",
-  "64971": "+{attackBoost:at} à un allié.\nIl peut attaquer une fois de plus ce tour-ci\\v s\u0027il est en {#OFFENSIVESTANCE}.",
+  "64971": "+{value:at}% de dégâts physiques à un allié.\nIl peut attaquer une fois de plus ce tour-ci\\v s\u0027il est en {#OFFENSIVESTANCE}.",
   "60939": "Entraînement",
   "22310": "+{magicalPowerValue:min} à +{armor:max} à un allié.\nConfère {#SHIELD} s\u0027il est en {#DEFENSIVESTANCE}.",
   "15178": "Renforcement",
@@ -1750,8 +1482,6 @@
   "21426": "Passe un allié en {#DEFENSIVESTANCE}.",
   "33809": "Posture Offensive",
   "54992": "Passe un allié en {#OFFENSIVESTANCE}.",
-  "10479": "Frappe Dissuasive",
-  "23587": "Inflige {magicalPowerValue:min} à {magicalDamage:max} aux adversaires adjacents à un allié en {#OFFENSIVESTANCE}\\vet le passe en {#DEFENSIVESTANCE}.",
   "46025": "Dissonance",
   "41164": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\nLa cible \u003cb\u003eATTAQUE\u003c/b\u003e un allié {#AROUND!}\\v si elle est {#WHISPERED[Chuchotée]} \u003csprite name\u003dgeneric_monster\u003e.",
   "10152": "Perturbation Phonique",
@@ -1765,37 +1495,33 @@
   "84876": "Passe-Passe",
   "21890": "Téléporte un allié jusqu\u0027à 2 cases.",
   "86956": "Contamination",
-  "50747": "Inflige {magicalPowerValue:min} à {magicalDamage:max} dans la zone \u003csprite name\u003dcell_cross\u003e ciblée.\n{attackBoost:at} pour le tour aux cibles {#PARASITIZED[PARASITÉES]} \u003csprite name\u003dgeneric_monster\u003e.",
+  "50747": "Inflige {magicalPowerValue:min} à {magicalDamage:max} dans la zone \u003csprite name\u003dcell_cross\u003e ciblée.\n{value:at}% de dégâts physiques pour le tour aux cibles {#PARASITIZED[PARASITÉES]} \u003csprite name\u003dgeneric_monster\u003e.",
   "84325": "Frappe Sismique",
   "12084": "Repousse tous les adversaires de 2 à 3 cases dans une direction aléatoire.\n{#COLLISION} : {magicalDamage:dmgC}.",
   "2750": "Faiblesse",
-  "1584": "-{value:at}\\_{%AT} à votre héros \\vquand ce \u003cb\u003eBLÂME\u003c/b\u003e est en main.\n{#FRUCTOSE}\\_: -2\\_{%PA} au coût de ce \u003cb\u003eBLÂME\u003c/b\u003e.\n{#UNION}\\_(2)\\_: Fusionne en {Spell:450}.",
+  "1584": "-{value:at}% de dégâts physiques à votre héros \\vquand ce \u003cb\u003eBLÂME\u003c/b\u003e est en main.\n{#FRUCTOSE}\\_: -2\\_{%PA} au coût de ce \u003cb\u003eBLÂME\u003c/b\u003e.\n{#UNION}\\_(2)\\_: Fusionne en {Spell:450}.",
   "83843": "Perte de connaissance",
   "65229": "Termine votre tour (DEV NEEDED) et défausse ce \u003cb\u003eBLÂME\u003c/b\u003e au début de votre tour.",
   "79632": "Nougat",
   "41543": "Téléporte un allié sur une case \\v{#AROUND} d\u0027un autre allié.\nPioche le premier sort de \u003cb\u003eFUSION\u003c/b\u003e.",
   "34968": "Maux de Cornes",
-  "39045": "{attackBoost:at} pour le tour à une cible {#PARASITIZED[PARASITÉE]}\\_\u003csprite name\u003dgeneric_monster\u003e.\n{#HERD}\\_: Inflige {magicalPowerValue:min} à {magicalDamage:max}.",
+  "39045": "{value:at}% de dégâts physiques pour le tour à une cible {#PARASITIZED[PARASITÉE]}\\_\u003csprite name\u003dgeneric_monster\u003e.\n{#HERD}\\_: Inflige {magicalPowerValue:min} à {magicalDamage:max}.",
   "90771": "Curono Varis",
   "87816": "Inflige {magicalDamage:dmgmin} OU inflige {magicalDamage:dmgmax}\\vsi la cible est {#PARASITIZED[PARASITÉE]}\\_\u003csprite name\u003dgeneric_monster\u003e.",
   "80163": "Grattage Intensif",
   "78183": "Les alliés {#ADJACENT[ADJACENTS]!} aux personnages {#PARASITIZED[PARASITÉS]}\\_\u003csprite name\u003dgeneric_monster\u003e déclenchent leur \u003cb\u003eATTAQUE\u003c/b\u003e.",
-  "81989": "",
-  "98558": "",
   "53512": "Tir de Couverture",
   "17881": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\n{#COMBO}\\_:\\_Renvoie ce sort dans votre main.",
   "9884": "Bouftou de Berger",
   "79137": "Invoque 1\\_{Summoning:458}.",
   "99507": "Détonation",
   "57894": "",
-  "28845": "",
-  "49643": "",
   "57829": "Éboulement",
   "34516": "Construit 3\\_{ObjectMechanism:1607[ROCHERS]}\\v{#AROUND!} d\u0027adversaires.",
   "30823": "Armure Affutée",
-  "18352": "Confère +{attackBoost:AT} aux \u003cb\u003eCRAQUELEURS\u003c/b\u003e\\vet +{attackBoost:v} s\u0027ils possèdent de l\u0027{%AR}.",
+  "18352": "Confère +{value:AT}% de dégâts physiques aux \u003cb\u003eCRAQUELEURS\u003c/b\u003e\\vet +{value:v}% de dégâts physiques s\u0027ils possèdent de l\u0027{%AR}.",
   "6800": "Armure de Force",
-  "60460": "Confère +{magicalPowerValue:min1} à +{attackBoost:max1} à un \u003cb\u003eCRAQUELEUR\u003c/b\u003e\\vs\u0027il possède de l\u0027{%AR}.\nConfère +{magicalPowerValue:min2} à +{armor:max2} sinon.",
+  "60460": "Confère +{value:perc}% de dégâts physiques à un \u003cb\u003eCRAQUELEUR\u003c/b\u003e s\u0027il possède de l\u0027{%AR}.\nConfère +{magicalPowerValue:min2} à +{armor:max2} sinon.",
   "80166": "Assommoir",
   "7514": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n{#STUN[ASSOMME]} la cible si elle est {#CRUMBLED}.",
   "46634": "Solidification",
@@ -1827,17 +1553,14 @@
   "15963": "Poing d\u0027Obsidienne",
   "5777": "Inflige {magicalPowerValue:min} à {magicalDamage:max} en zone\\_\u003csprite name\u003dcell_around\u003e.",
   "65377": "Recomposition",
-  "37833": "Échange la place d\u0027un \u003cb\u003eCRAQUELEUR\u003c/b\u003e\\vavec celle d\u0027un {ObjectMechanism:1607}.\nLui confère +{attackBoost:AT} et +{armor:AR}.",
+  "37833": "Échange la place d\u0027un \u003cb\u003eCRAQUELEUR\u003c/b\u003e\\vavec celle d\u0027un {ObjectMechanism:1607}.\nLui confère +{value:AT}% de dégâts physiques et +{armor:AR}.",
   "63416": "Rock \u0027N\u0027 Roll",
-  "97167": "Pousse un {ObjectMechanism:1607} sur un personnage aligné.\nInflige ensuite {magicalPowerValue:min} à {magicalDamage:max} {#AROUND!} de lui.",
   "78746": "Sédimentation",
   "37046": "Un \u003cb\u003eCRAQUELEUR\u003c/b\u003e absorbe l\u0027{%ar}\\vde tous les personnages en jeu.",
   "74626": "Shrapnels",
   "3588": "Détruit l’{%ar} d’un \u003cb\u003eCRAQUELEUR\u003c/b\u003e\\vpour infliger des dégâts équivalents {#AROUND!} de lui.",
   "98207": "Jambes Lourdes",
   "85952": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n-1\\_{%pm} à la cible jusqu\u0027à son prochain tour\\vsi elle est {#CRUMBLED}.",
-  "28492": "Éclatement Rocheux\n",
-  "81175": "",
   "15195": "Éclatement Rocheux",
   "77198": "Détruit un {ObjectMechanism:1607}\\vet inflige ses {%BL} {#AROUND!} de lui.",
   "40485": "Shadow Test",
@@ -1855,7 +1578,7 @@
   "74564": "Tsunami",
   "7845": "Inflige {magicalPowerValue:min} à {magicalDamage:max} aux adversaires.\n\\---\nDéplace de 3 cases vers un bord du plateau\\vtoutes les entités.",
   "18091": "Du Sang dans l\u0027Eau",
-  "67365": "Confère +{attackBoost:at} par adversaire {#BLOODY}\\và l\u0027allié ciblé.",
+  "67365": "Confère +{value:at}% de dégâts physiques par adversaire {#BLOODY} à l\u0027allié ciblé.",
   "52125": "Touché Électrique",
   "91430": "Applique {#ELECTRIFIED}.",
   "41412": "Décharge Électrique",
@@ -1865,7 +1588,7 @@
   "32394": "Conduction Paralysante",
   "25263": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nApplique {#DISARMED} si la cible est {#ELECTRIFIED[Électrifiée]}.",
   "6714": "Lame de Fond",
-  "88180": "Inflige {magicalPowerValue:min} à {magicalDamage:max} à l\u0027adversaire ciblé\\v et repousse de {cell:c}.",
+  "88180": "Inflige {magicalPowerValue:min} à {magicalDamage:max} à l\u0027adversaire ciblé\\v et {#PUSH} de {cell:c}.",
   "18462": "Contre-Courant",
   "7377": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nAttire la cible vers un allié aligné jusqu\u0027à {value:c} cases.",
   "62263": "Geyser",
@@ -1874,8 +1597,6 @@
   "83895": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nCopie puis défausse le sort le moins cher du joueur si la cible est {#WHISPERED[Chuchotée]} \u003csprite name\u003dgeneric_monster\u003e.",
   "50687": "Action Héroïque",
   "84255": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\n{#DEATHBLOW}\\_: Fait évoluer un \u003cb\u003eARCHER\u003c/b\u003e\\vou \u003cb\u003eFANTASSIN\u003c/b\u003e allié.",
-  "72322": "",
-  "62729": "",
   "11699": "Égratignure",
   "57742": "Applique {#BLOODY}.\n\\---\n{#REWIND}.",
   "45163": "Saignement",
@@ -1893,7 +1614,7 @@
   "40374": "Soif de Sang",
   "60535": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nTéléporte l\u0027allié le plus éloigné sur une case adjacente à la cible si elle est {#BLOODY[Ensanglantée]} \u003csprite name\u003dgeneric_monster\u003e.",
   "73248": "Odeur du Sang",
-  "9236": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nConfère +{attackBoost:at} et +1\\_{%pm} pour le tour aux alliés\\vsi la cible est {#BLOODY[Ensanglantée]} \u003csprite name\u003dgeneric_monster\u003e.",
+  "9236": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.\n\\---\nConfère +{value:at}% de dégâts physiques et +1\\_{%pm} pour le tour aux alliés\\vsi la cible est {#BLOODY[Ensanglantée]} \u003csprite name\u003dgeneric_monster\u003e.",
   "68501": "Eaux Infestées",
   "26135": "Inflige {magicalPowerValue:min} à {magicalDamage:max} aux adversaires.\n\\---\nDégâts doublés sur les cibles {#BLOODY[Ensanglantées]} \u003csprite name\u003dgeneric_monster\u003e.",
   "54747": "Sabrage",
@@ -1907,11 +1628,11 @@
   "38939": "Coup de Sabot",
   "7681": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.",
   "77293": "Ruade",
-  "33702": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}\net repousse de {cell:c}.",
+  "33702": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}\net {#PUSH} de {cell:c}.",
   "30649": "Excès de Taurine",
-  "92898": "Confère +{attackBoost:at} à un allié et le téléporte jusqu\u0027à {cell:c} pour l\u0027aligner avec un héros adverse.",
+  "92898": "Confère +{value:at}% de dégâts physiques à un allié et le téléporte jusqu\u0027à {cell:c} pour l\u0027aligner avec un héros adverse.",
   "30534": "Voir Rouge",
-  "35763": "Confère +{attackBoost:at} à un allié.",
+  "35763": "Confère +{value:at}% de dégâts physiques à un allié.",
   "32334": "Panser les Meaux",
   "43897": "Soigne un allié de {magicalPowerValue:min} à {heal:h}.",
   "16076": "Cocon Familial",
@@ -1919,7 +1640,7 @@
   "49802": "Charge de Taure",
   "85195": "Un allié charge un adversaire aligné jusqu\u0027à {cell:c} et lui inflige son {%AT}",
   "96083": "Acharnement",
-  "3055": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n{#DEATHBLOW}\\_: Double l\u0027{%AT} de l\u0027allié avec le plus de {%PV}.",
+  "3055": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n{#DEATHBLOW}\\_: +{value:at}% de dégâts physiques à l\u0027allié avec le plus de {%PV}.",
   "52639": "Vaches Folles",
   "66427": "Tous les alliés se déplacent de {cell:c} en ligne dans une direction aléatoire et déclenchent leur \u003cb\u003eATTAQUE\u003c/b\u003e s\u0027ils collisionnent avec un adversaire.",
   "23110": "Coup de Boutoir",
@@ -1935,13 +1656,13 @@
   "44689": "Épaissir le Cuir",
   "34878": "Confère {magicalPowerValue:min} à {armor:ar} à l\u0027allié ayant le moins de PV.",
   "79822": "La Famille d\u0027Abord",
-  "29168": "Inflige {magicalDamage:dmg} à l\u0027allié ayant le plus de {%PV} et soigne de {heal:h} l\u0027allié ayant le moins de {%PV}.",
+  "29168": "",
   "11848": "De Mal en Pis",
   "26348": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\n{#DEATHBLOW}\\_: Tous les alliés rejouent le tour.",
   "83628": "Un effet Boeuf",
   "20712": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\nPioche un sort.\n{#DEATHBLOW}\\_: Réduit le coût du prochain sort joué ce tour à 0\\_{%PA}.",
   "13809": "Retenue",
-  "78671": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\nLaisse la cible à 1\\_{%PV} si elle devait mourir.",
+  "78671": "",
   "46683": "Aucune Retraire Possible",
   "87185": "Inflige {magicalPowerValue:min} à {magicalDamage:dmg}.\nDouble les dégâts si la cible est sur le bord du plateau.",
   "92333": "Famille Nombreuse",
@@ -1959,7 +1680,7 @@
   "35112": "Nouvelle Laine",
   "61728": "Invoque un {Summoning:484} \u003cb\u003eAUTOUR\u003c/b\u003e d\u0027un \u003cb\u003eBOUFTOU\u003c/b\u003e.",
   "50153": "Page 2 du Grimoire des Vents",
-  "23468": "Repousse de {cell:c}.\n\\---\n{%CantGoToDeck}",
+  "23468": "{#PUSH} de {cell:c}.\n\\---\n{%CantGoToDeck}",
   "34231": "Page 3 du Grimoire des Vents",
   "95405": "Applique l\u0027état \u003cb\u003eÉVENTÉ\u003c/b\u003e\u003csprite name\u003dventilated\u003e.\n\\---\n{%CantGoToDeck}",
   "35204": "Page 2 du Grimoire de Feu",
@@ -1977,7 +1698,7 @@
   "4791": "Page 2 du Grimoire de Glace",
   "54286": "Soigne {heal:h} à un allié.\n\\---\n{%CantGoToDeck}",
   "95614": "Colère de Iop",
-  "8034": "Inflige {magicalDamage:dmg}.\n{#MELEE}\\_: +{magicalDamage:mult}.",
+  "8034": "Inflige {magicalDamage:dmg}.\n\\---\n{#MELEE}\\_: +{magicalDamage:mult}.",
   "8908": "Charge Alliée",
   "84828": "Un allié \u003cb\u003echarge\u003c/b\u003e un personnage aligné jusqu\u0027à {cell:c} et lui inflige {magicalDamage:dmg}.",
   "29372": "Vague Solaire",
@@ -2073,13 +1794,13 @@
   "6538": "Appel Corrompu",
   "52802": "Invoque une {Summoning:644} jusqu\u0027à {cell:c} de votre héros.",
   "21147": "Champion du jour",
-  "41622": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.785.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\n{#DEATHBLOW!}\\_: Un {#LIGHTNING} inflige {value:Skill.785.perc2}% de son {%AT} aux adversaires.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:  -1\\_{#CHAMPIONAURA[AURA CHAMPION]}",
+  "41622": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.785.boost}% aux dégâts magiques et physiques\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA[AURAS CHAMPION]}\n\\---\n{#DEATHBLOW}\\_: Un {#LIGHTNING} inflige {value:Skill.785.dmg} dégâts physiques à l\u0027adversaire ayant le plus de {%pv}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:  -1\\_{#CHAMPIONAURA}.",
   "89016": "Resurrection",
   "99440": "Ramène à la vie un compagnon Iop aléatoire.",
   "25665": "DynamicTooltip",
   "25151": "Inflige\n\u003cif deckbuild\u003e{magicalDamage:base} + {value:perOpponent} par ennemis autour de votre héros.\u003c/if\u003e\n\u003cif fight\u003e{magicalDamage:total} ({value:base} + {value:bonus})\u003c/if\u003e\nà l\u0027ennemi ciblé.\n\n\u003cif fight\u003e 150% de l\u0027attaque de votre héros : {value:atkHero}\u003c/if\u003e",
   "85874": "Champion du Coeur",
-  "13819": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.782.perc}% d\u0027{%at}\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA}\n\\---\nQuand il gagne de l\u0027{%AR} votre héros déclenche une {#explosion} d\u0027une valeur égale à {value:Skill.782.perc2}% de son {%AT}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_{#CHAMPIONAURA[AURA CHAMPION]}",
+  "13819": "Votre héros se transforme et gagne\\_:\n+{valueAndNext:Skill.782.perc}% aux dégâts magiques et physiques\n+{value:FloatingCounterEffect.89.pm}\\_{%pm}\n+3 {#CHAMPIONAURA[AURAS CHAMPION]}\n\\---\nVotre héros déclenche {explosion:Skill.782.dmg} quand il gagne de l\u0027{%ar}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: -1\\_{#CHAMPIONAURA}.",
   "55631": "Résonance \u003cif fight\u003e(Niv.{value:evo})\u003c/if\u003e",
   "30146": "Inflige \u003cif indeck\u003e{magicalDamage:dmg}\u003c/if\u003e\u003cif infight\u003e{magicalDamage:total}\u003c/if\u003e et détruit ce sort.\n\\---\n{#EVOLVE}\\_: +{magicalDamage:v} pour le tour quand vous jouez un sort.",
   "99444": "Appel Vide",
@@ -2087,13 +1808,13 @@
   "52525": "Appel Volcanique",
   "99778": "Invoque une {Summoning:350} jusqu\u0027à {cell:c} de votre héros.",
   "47784": "Pacte avec le Dragon",
-  "46606": "Transforme votre héros en \u003cb\u003eDraconar\u003c/b\u003e et détruit ce sort.\nVotre héros gagne +1\\_{%pm}, +1\\_{%pa}, +50% aux dégâts d\u0027Arme et des Sorts tant qu\u0027il est transformé.\n\\---\n+{value:dr}% aux dégâts des sorts \u003cb\u003eDraconiques\u003c/b\u003e tant que ce sort est dans votre main.\n\\---\nQuand un allié joue un sort \u003cb\u003eDraconique\u003c/b\u003e\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "46606": "Transforme votre héros en \u003cb\u003eDRACONAR\u003c/b\u003e si vous disposez d\u0027au moins {value:Wakfu} niveaux de WAKFU.\n\\---\nAjoute +{value:valueB}% aux dégâts de vos sorts DRACONIQUES tant qu\u0027il est dans votre main.\n\\---\n{%CantGoToDeck}\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "41596": "Traversée Draconique",
   "76789": "Déplace un allié en ligne.\n\\---\nInflige {magicalDamage:dmg} aux personnages traversés.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "15501": "Griffes Draconiques",
   "70245": "Inflige {magicalDamage:dmg} à un personnage adjacent\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "27700": "Traité Draconique",
-  "95641": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:boost} par sort \u003cb\u003eDraconique\u003c/b\u003e équipé.\n\\---\nRéduit de 2\\_{%pa} le coût de votre {Spell:65910!} si la cible a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "95641": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:boost} par sort \u003cb\u003eDraconique\u003c/b\u003e dans votre jeu.\n\\---\n+{value:valueWakfu} niveaux de\u003cb\u003e WAKFU\u003c/b\u003e si la cible a l\u0027état \u003cb\u003eMOUILÉE\u003c/b\u003e\u003csprite name\u003dwet\u003e.\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "54053": "Voracité Draconique",
   "965": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:boost} par sort \u003cb\u003eDraconique\u003c/b\u003e équipé.\n\\---\n{#LIFESTEAL} si la cible a l\u0027état \u003cb\u003eHUILÉ\u003c/b\u003e\u003csprite name\u003doiled\u003e.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "2544": "Régénération Draconique",
@@ -2101,19 +1822,17 @@
   "81126": "Queue Draconique",
   "88991": "Inflige {magicalDamage:dmg}\\v +{magicalDamage:boost} par sort \u003cb\u003eDraconique\u003c/b\u003e équipé.\n\\---\n{#STUN[ASSOMME]} la cible si elle a l\u0027état \u003cb\u003eBOUEUX\u003c/b\u003e\u003csprite name\u003dmuddy\u003e.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "50902": "Dragonnet Chromatique",
-  "71811": "Invoque un {Summoning:993} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
-  "84334": "Pacte avec le Dragon",
-  "74926": "Ce sort est détruit quand il est joué.",
+  "71811": "Invoque un {Summoning:993} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros.\n\\---\n{%CantGoToDeck}\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "75345": "Métamorphose Draconique",
-  "62657": "Transforme le compagnon allié ciblé en serviteur Draconique et lui confère +{magicalPowerValue:boost}% de son {%at} et de ses {%pv}.\n\\---\nQuand le serviteur Draconique attaque\\_: Réduit de 1\\_{%pa} le coût des sorts {Spell:65910!} alliés.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "62657": "Transforme le compagnon allié ciblé en serviteur Draconique et lui confère +{value:boost}% de son {%AT} et de ses {%pv}.\n\\---\nQuand il attaque\\_: +{value:valueWakfu} niveau de WAKFU.\n\\---\n{%CantGoToDeck}\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Draconique\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "34371": "Puit des Ombres",
   "29328": "Construit un {FloorMechanism:1740} jusqu\u0027à {cell:c} de {Companion:231}.",
   "54133": "Pacte avec le Feu",
-  "75328": "Invoque un {Summoning:920} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort FEU\u003csprite name\u003dfire\u003e\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
+  "75328": "Invoque un {Summoning:920} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort FEU\u003csprite name\u003dfire\u003e\\_et que ce sort est en main\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
   "7249": "Flambée Ardente",
   "81653": "Inflige {magicalDamage:dmg}\\v+{magicalDamage:boost} par autre sort FEU\u003csprite name\u003dfire\u003e dans votre main.",
   "96942": "Motivation Ardente",
-  "88276": "Confère +{attackBoost:at} pour le tour\\v+{attackBoost:boost} par autre sort FEU\u003csprite name\u003dfire\u003e dans votre main.",
+  "88276": "Confère +{value:at}% aux dégâts physiques pour le tour\\v+{value:boost}% par autre sort FEU\u003csprite name\u003dfire\u003e dans votre main.",
   "81084": "Boule de Feu Ardente \u003cif fight\u003e(Niv.{value:evo})\u003c/if\u003e",
   "13975": "Inflige \u003cif indeck\u003e{magicalDamage:dmg}\u003c/if\u003e\u003cif in fight\u003e{magicalDamage:total}\u003c/if\u003e.\n\\---\n{#EVOLVE}\\_: +{magicalDamage:v} quand vous jouez un sort FEU\u003csprite name\u003dfire\u003e.",
   "26662": "Flamme Ardente",
@@ -2121,15 +1840,15 @@
   "87234": "Souffle Ardent \u003cif fight\u003e(Niv.{value:evo})\u003c/if\u003e",
   "58185": "Inflige \u003cif indeck\u003e{magicalDamage:dmg}\u003c/if\u003e\u003cif in fight\u003e{magicalDamage:total}\u003c/if\u003e sur les {cell:c} devant votre héros.\n\\---\n{#EVOLVE}\\_: +{magicalDamage:v} quand votre héros gagne de l\u0027{%at}.",
   "2898": "Pacte avec l\u0027Air",
-  "76674": "Invoque un {Summoning:349} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort AIR\u003csprite name\u003dwind\u003e\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
+  "76674": "Invoque un {Summoning:349} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort AIR\u003csprite name\u003dwind\u003e\\_et que ce sort est en main\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
   "17652": "Pacte avec la Terre",
-  "93432": "Invoque un {Summoning:323} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort TERRE\u003csprite name\u003dearth\u003e\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
+  "93432": "Invoque un {Summoning:323} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort TERRE\u003csprite name\u003dearth\u003e\\_et que ce sort est en main\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
   "11890": "Pacte avec l\u0027Eau",
-  "1795": "Invoque un {Summoning:757} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort EAU\u003csprite name\u003dwater\u003e\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
+  "1795": "Invoque un {Summoning:757} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à votre héros et détruit ce sort.\n\\---\nQuand un allié joue un sort EAU\u003csprite name\u003dwater\u003e\\_et que ce sort est en main\\_:\nLe coût de ce sort est réduit des {%pa} dépensés.",
   "32588": "Choc Déchaîné",
   "95527": "Inflige {magicalDamage:dmg}\\v+{magicalDamage:boost} par autre sort AIR\u003csprite name\u003dwind\u003e dans votre main.",
   "66287": "Souffle Déchaîné",
-  "25687": "Inflige {magicalDamage:dmg}.\n\\---\nRepousse la cible \u003cif indeck\u003ed\u0027autant de cases que d\u0027autres sorts AIR\u003csprite name\u003dwind\u003e dans votre main.\u003c/if\u003e\u003cif infight\u003ede {cell:inhand}.\u003c/if\u003e",
+  "25687": "Inflige {magicalDamage:dmg}.\n\\---\n{#PUSH} la cible \u003cif indeck\u003ed\u0027autant de cases que d\u0027autres sorts AIR\u003csprite name\u003dwind\u003e dans votre main.\u003c/if\u003e\u003cif infight\u003ede {cell:inhand}.\u003c/if\u003e",
   "53848": "Cyclone Déchaîné",
   "51906": "Inflige {magicalDamage:dmg}.\n\\---\nPiochez 1\\_sort par autre sort AIR\u003csprite name\u003dwind\u003e dans votre main.",
   "60229": "Orage Déchaîné \u003cif fight\u003e(Niv.{value:evo})\u003c/if\u003e",
@@ -2139,7 +1858,7 @@
   "68881": "Charge Rocheuse",
   "97097": "Votre héros charge un personnage aligné jusqu\u0027à {cell:c}\\v +1 case par autre sort TERRE\u003csprite name\u003dearth\u003e dans votre main.\n\\---\nInflige {magicalDamage:dmg}.",
   "40279": "Armure Rocheuse",
-  "17048": "Confère +{armor:ar}\\v +{armor:boost} par autre sort TERRE\u003csprite name\u003dearth\u003e dans votre main.",
+  "17048": "Confère +{armor:ar} à un allié \\v +{armor:boost} par autre sort TERRE\u003csprite name\u003dearth\u003e dans votre main.",
   "67536": "Enlisement Rocheux",
   "99663": "Inflige {magicalDamage:dmg}.\n\\---\n-1\\_{%pm} pour le tour par autre sort TERRE\u003csprite name\u003dearth\u003e dans votre main.",
   "64532": "Envol Rocheux",
@@ -2156,14 +1875,10 @@
   "33851": "Applique {frozen:PropertyEffect.26.FrozenDmg} à la cible.\n\\---\n+1\\_cible aléatoire par autre sort EAU\u003csprite name\u003dwater\u003e dans votre main.",
   "17254": "Horloge Aqueuse \u003cif fight\u003e(Niv.{value:evo})\u003c/if\u003e",
   "70824": "Inflige \u003cif indeck\u003e{magicalDamage:dmg}\u003c/if\u003e\u003cif in fight\u003e{magicalDamage:total}\u003c/if\u003e dans la zone \u003csprite name\u003dcell_cross\u003e ciblée.\n\\---\n{#EVOLVE}\\_: +{magicalDamage:v} quand vous volez des {%pa} à un adversaire.",
-  "78204": "",
-  "88868": "",
-  "76682": "",
-  "79898": "",
   "34859": "Pacte avec le Nécronomigore",
-  "93096": "Invoque un {Summoning:29} jusqu\u0027à {cell:c} de votre héros et détruit ce sort.\n\\---\nConfère +{magicalPowerValue:boostAT}% d\u0027{%AT} et +{magicalPowerValue:boostAR}% des {%pv} en {%ar} aux \u003cb\u003eNécromes\u003c/b\u003e alliés tant qu\u0027il est dans votre main.\n\\---\nLe coût de ce sort est réduit d\u0027autant de {%pa} que le coût des sorts et compagnons \u003cb\u003eNécromes\u003c/b\u003e alliés joués.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "93096": "Invoque un {Summoning:29} jusqu\u0027à {value:c} cases de votre héros si vous disposez d\u0027au moins {value:valueStasis} niveaux de \u003cb\u003eSTASIS\u003c/b\u003e.\\v\\---\nConfère +{value:boostAT}% d\u0027{%AT} et +{value:boostAR}% des PV en AR aux \u003cb\u003eNÉCROMES\u003c/b\u003e alliés lorsqu\u0027ils sont invoqués tant que ce sort est dans votre main.\\v\\---\n{%CantGoToDeck}\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "7855": "Vent Nécromique",
-  "86540": "Repousse de {cell:c}.\n\\---\nConfère 100% d\u0027Esquive pour le tour si la cible est un \u003cb\u003eNécrome\u003c/b\u003e allié.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "86540": "{#PUSH} de {cell:c}.\n\\---\nConfère 100% d\u0027Esquive jusqu\u0027au prochain tour allié si la cible est un \u003cb\u003eNécrome\u003c/b\u003e allié.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "34051": "Portail Nécromique",
   "98301": "Téléporte un allié jusqu\u0027à {cell:c}.\n\\---\nRejoue son tour si c\u0027est un \u003cb\u003eNécrome\u003c/b\u003e.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eSort Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "23148": "Rapidité Nécromique",
@@ -2187,15 +1902,15 @@
   "38039": "Racler",
   "5218": "Inflige {magicalPowerValue:min} à {magicalDamage:max}.",
   "10875": "Rackett",
-  "60045": "Inflige {magicalDamage:dmg}.\n\\---\nConfère +{attackBoost:at} à un allié adjacent pour le tour.",
+  "60045": "Inflige {magicalDamage:dmg}.\n\\---\nConfère +{value:at}% de dégâts physiques à un allié adjacent pour le tour.",
   "29395": "Raffermir",
-  "96961": "Confère +{attackBoost:at} à un allié.",
+  "96961": "Confère +{value:at}% de dégâts physiques à un allié.",
   "59395": "Rapido",
   "22372": "Confère +{value:pm}\\_{%pm} à un allié.",
   "98306": "Rabougri",
   "19018": "Inflige {magicalPowerValue:min} à {magicalDamage:max} et applique l\u0027état {#BITTEN}.",
   "55758": "Rallongé",
-  "87783": "Confère +{attackBoost:at} à un allié et +{attackBoost:at1} si un adversaiere à l\u0027état {#BITTEN}.",
+  "87783": "Confère +{value:at}% de dégâts physiques à un allié et +{value:at1}% de dégâts physiques si un adversaire à l\u0027état {#BITTEN}.",
   "34470": "Ralentir",
   "92244": "Inflige {magicalDamage:dmg}.\n\\---\n{value:pm}\\_{%pm} pour un tour si la cible a l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e.",
   "37991": "Raviver",
@@ -2205,11 +1920,208 @@
   "61444": "Rabibocher",
   "86037": "\u003cb\u003eTéléporte\u003c/b\u003e l\u0027allié le plus éloigné sur une case adjacente à la cible.",
   "19895": "Xelocube Solaire",
-  "7020": "Réduit de 1\\_{%pa} le coût de ce sort quand vous ajoutez 1\\_{%pa} à votre {%reserve}.\nConstruit un {ObjectMechanism:439} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:439} déjà en jeu.",
+  "7020": "Construit un {ObjectMechanism:439} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:439} déjà en jeu.",
   "4961": "Xelocube Lunaire",
-  "53663": "Réduit de 1\\_{%pa} le coût de ce sort quand vous ajoutez 1\\_{%pa} à votre {%reserve}.\nConstruit un {ObjectMechanism:1007} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:1007} déjà en jeu.",
+  "53663": "Construit un {ObjectMechanism:1007} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:1007} déjà en jeu.",
   "10921": "Xelocube Vide",
-  "58355": "Réduit de 1\\_{%pa} le coût de ce sort quand vous ajoutez 1\\_{%pa} à votre {%reserve}.\nConstruit un {ObjectMechanism:903} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:903} déjà en jeu.",
+  "58355": "Construit un {ObjectMechanism:903} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:903} déjà en jeu.",
   "56684": "Xelocube Volcanique",
-  "88511": "Réduit de 1\\_{%pa} le coût de ce sort quand vous ajoutez 1\\_{%pa} à votre {%reserve}.\nConstruit un {ObjectMechanism:1364} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:1364} déjà en jeu."
+  "88511": "Construit un {ObjectMechanism:1364} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:1364} déjà en jeu.",
+  "27484": "Coup de Poing",
+  "93669": "Inflige {magicalDamage:dmg}.",
+  "5998": "A corps perdu",
+  "71449": "Charge un adversaire aligné jusqu’à 5 cases et inflige {magicalDamage:dmg}.",
+  "4758": "Instinct de Survie",
+  "22439": "Téléporte votre héros jusqu\u0027à {cell:c}.\n\\---\nInflige ensuite {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "73435": "Résilience",
+  "49633": "Inflige {magicalDamage:dmg}.\nConfère l\u0027équivalent en {%AR} à votre héros.",
+  "66944": "Course Fantômatique",
+  "49554": "Un \u003cb\u003eCRABE\u003c/b\u003e \u003cb\u003echarge\u003c/b\u003e un personnage aligné jusqu\u0027à {cell:c} et déclenche son {%AT}.",
+  "22695": "Saumure",
+  "46084": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.",
+  "71988": "Pincement",
+  "42592": "Inflige {magicalDamage:dmg}.",
+  "86603": "Attraction",
+  "10832": "Tous les \u003cb\u003eCRABES\u003c/b\u003e alignés sont attirés jusqu\u0027à la cible. Inflige {magicalDamage:dmg} par \u003cb\u003eCRABE\u003c/b\u003e attiré.",
+  "78889": "Carapace",
+  "20292": "Confère +{armor:ar} à tous les \u003cb\u003eCRABES\u003c/b\u003e.",
+  "60924": "Encrage",
+  "67349": "Construit un {FloorMechanism:1392} sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un adversaire.",
+  "69622": "Inflige {magicalDamage:dmg}.",
+  "19327": "Coup de Poing",
+  "77822": "Inflige {magicalDamage:dmg}.",
+  "42460": "Coup de Poing",
+  "57481": "Coup de Poing",
+  "96719": "Inflige {magicalDamage:dmg}.",
+  "79111": "Enlisement",
+  "10512": "Retire 1 {%PM} aux adversaires pour le tour.\n\\---\n{%CantGoToDeck}",
+  "59105": "Fureur Collective",
+  "54114": "Les alliés gagnent {value:p} % de dégâts physiques, jusqu’au début de votre prochain tour.\n\\---\n{%CantGoToDeck}",
+  "70447": "Ablutions",
+  "13503": "Soigne le personnage allié de {value:pv}% de ses {%PV}MAX.\n\\---\n{%CantGoToDeck}",
+  "8677": "Folie Passagère",
+  "13309": "Un allié inflige son {%AT} autour\\_\u003csprite name\u003dcell_around/\u003e de lui.\n\\---\n{%CantGoToDeck}",
+  "53329": "Ablutions Collectives",
+  "4417": "Soigne les alliés de 15% de leurs {%PV}MAX.\n\\---\n{%CantGoToDeck}",
+  "63163": "Mysticisme",
+  "98549": "Ajoute {addNeutral:r}.\n\\---\n{%CantGoToDeck}",
+  "81209": "Force et Honneur",
+  "56790": "Confère {armor:ar} aux alliés.\n\\---\n{%CantGoToDeck}",
+  "68867": "Au secours",
+  "91537": "Échange la position de 2 personnages.\n\\---\n{%CantGoToDeck}",
+  "6864": "Du balai",
+  "45932": "{#PUSH} 1 personnage de {cell:c}.\n\\---\n{%CantGoToDeck}",
+  "21013": "Tremblement de terre",
+  "53403": "Inflige {magicalDamage:dmg} aux adversaires.\n\\---\n{%CantGoToDeck}",
+  "16206": "1 2 3 Soleil!",
+  "83528": "Réduit à 0 les {%PM} d’un adversaire pour le tour.\n\\---\n{%CantGoToDeck}",
+  "15093": "Prime d\u0027activité",
+  "57322": "Ajoute +3{%PA} à la {%reserve}.\n\\---\n{%CantGoToDeck}",
+  "49437": "Inaténiable",
+  "21954": "Confère {#untargetable} à un allié jusqu\u0027au prochain tour allié.\n\\---\n{%CantGoToDeck}",
+  "9056": "Tremblement de têtes",
+  "14581": "{#stun[ASSOMME]} les adversaires pour le tour.\n\\---\n{%CantGoToDeck}",
+  "42276": "Fission",
+  "74960": "Inflige {magicalDamage:dmg} et la cible déclenche {explosion:exp}.\n\\---\n{%CantGoToDeck}",
+  "10727": "Tap taupe",
+  "81879": "{#stun[ASSOMME]} un adversaire.\n\\---\n{%CantGoToDeck}",
+  "48900": "Vendetta",
+  "87571": "Inflige {magicalDamage:dmg} par adversaire en jeu.\n\\---\n{%CantGoToDeck}",
+  "25066": "Furtivité",
+  "83662": "Confère {#phase} à un allié.\n\\---\n{%CantGoToDeck}",
+  "93517": "Retour en grâce",
+  "98659": "Vos compagnons morts peuvent être réinvoqués.\n\\---\n{%CantGoToDeck}",
+  "6257": "ça tourne, action !",
+  "5092": "Tous les alliés infligent leur {%AT} aux cases adjacentes\\_\u003csprite name\u003dcell_cross\u003e.\n\\---\n{%CantGoToDeck}",
+  "73277": "Coup de baguette",
+  "72488": "Les alliés gagnent {value:dmg}% les dégâts magiques jusqu’au début votre prochain tour.\n\\---\n{%CantGoToDeck}",
+  "421": "Cicatrisation Spontannée",
+  "2306": "Soigne un allié de {value:pv}% de ses {%PV}.\n\\---\n{%CantGoToDeck}",
+  "52853": "Provocation",
+  "28821": "Confère +{armor:ar} à votre héros.\n\\---\nAttire jusqu\u0027à votre héros les personnages alignés avec lui.",
+  "70554": "Amplification",
+  "26281": "{#MELEE}\\_: Confère 1\\_\u003cb\u003eAURA\u003c/b\u003e à votre héros s\u0027il en possède déjà une.",
+  "61889": "Bond Handicapant",
+  "88114": "Téléporte votre héros jusqu\u0027à {cell:c}.\n\\---\nRetire ensuite {value:pm}\\_{%pm} pour le tour aux adversaires autour\\_\u003csprite name\u003dcell_around/\u003e de lui.",
+  "70164": "Je Vous Prends Tous !",
+  "60568": "Inflige {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.\n\\---\n{#MELEE}\\_: +{magicalDamage:mult}.",
+  "26066": "Repositionnement",
+  "12870": "Déplace votre héros sur une case adjacente\\_\u003csprite name\u003dcell_cross/\u003e.\n\\---\nRéduit de {value:pa}\\_{%pa} le coût du prochain sort de charge que vous jouez ce tour.",
+  "76979": "Focus",
+  "17625": "Les alliés alignés à la cible \u003cb\u003echargent\u003c/b\u003e et lui infligent {magicalDamage:dmg}.",
+  "46748": "Charge de Recup\u0027",
+  "19623": "Bousculade",
+  "66670": "Inflige {magicalDamage:dmg} à un personnage adjacent\\_\u003csprite name\u003dcell_cross/\u003e à votre héros et le {#PUSH} de {cell:c}.",
+  "86486": "Estocade",
+  "61203": "Inflige des dégâts d\u0027un montant égal à l\u0027{%at} de votre héros sur les {cell:c} devant lui.",
+  "89238": "Adrénaline",
+  "70893": "Confère +{value:boost}% aux dégâts physiques et +{value:pm}\\_{%pm} à un allié pour le tour.",
+  "83194": "Assaut Flamboyant",
+  "6083": "Téléporte votre héros jusqu\u0027à {cell:c}.\n\\---\nIl déclenche {explosion:ex} sur ses cases de départ et d\u0027arrivée.",
+  "58938": "Arrivée du Bourreau",
+  "85180": "Inflige {magicalDamage:dmg}.\n\\---\nTéléporte votre héros à côté de la cible s\u0027il a moins de {%pv} que l\u0027{%at} de votre héros.",
+  "55207": "Picotements Spectraux",
+  "45999": "Inflige \u003cif indeck\u003e{magicalDamage:dmg}\u003c/if\u003e\u003cif in fight\u003e{magicalDamage:total}\u003c/if\u003e.\n\\---\n{#EVOLVE}\\_: +{magicalDamage:mult} par adversaire traversés par votre héros ce tour.",
+  "18732": "Déchirement Spectral",
+  "87902": "Inflige {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around/\u003e de votre héros.\n\\---\n+{magicalDamage:mult} si votre héros est {#PHASE[DÉPHASÉ]}.",
+  "66296": "Frontière Spectrale",
+  "90974": "Confère {#PHASE} et +{value:pm}\\_{%pm} pour le tour à un allié.",
+  "76383": "Lame de Glace",
+  "75706": "Inflige {magicalDamage:dmg}.\n\\---\nConfère 1\\_{#ICESWORD} à votre héros s\u0027il a un {#SHIELD}.",
+  "58926": "Frappe Glaçante",
+  "42844": "Inflige {magicalDamage:dmg}.\n\\---\nApplique {frozen:PropertyEffect.26.FrozenDmg} si la cible a l\u0027état \u003cb\u003eMOUILLÉ\u003c/b\u003e\u003csprite name\u003dwet\u003e.",
+  "84014": "Glace Perforante",
+  "36355": "Inflige {magicalDamage:dmg}.\n\\---\n{#DEATHBLOW}\\_: Confère {#SHIELD} à votre héros.",
+  "32912": "Éclat de Bouclier",
+  "41978": "Détruit le {#SHIELD} de votre héros pour infliger {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around/\u003e de lui.",
+  "80736": "{#PUSH} un {ObjectMechanism:1607} sur un personnage aligné.",
+  "85454": "Présent Accablant",
+  "92129": "Inflige {magicalDamage:dmg}.\n\\---\n+{magicalDamage:mult} par \u003cb\u003eAURAS\u003c/b\u003e que possède votre héros.",
+  "72128": "Éclats Métaliques",
+  "36967": "Inflige des dégâts d\u0027un montant égal à l\u0027{%ar} de votre héros à ses adversaires adjacents \u003csprite name\u003dcell_cross/\u003e.\n\\---\nRetire l\u0027{%ar} de votre héros.",
+  "21725": "Magnétisme Ionique",
+  "18591": "Attire les personnages alignés à votre héros de {cell:c}.\n\\---\nConfère +{armor:ar} à votre héros par personnage adjacent\\_\u003csprite name\u003dcell_cross/\u003e à lui.",
+  "49175": "Aura\u0027Gasmique",
+  "20048": "Inflige {magicalDamage:dmg} dans la zone \u003csprite name\u003dcell_cross/\u003e ciblée et {addReserve:pa} par \u003cb\u003eAURA\u003c/b\u003e que possède votre héros.\n\\---\nLibère les \u003cb\u003eAURAS\u003c/b\u003e de votre héros.",
+  "45815": "Activer les Aiguilles",
+  "51034": "Inflige {magicalDamage:dmg}.\n\\---\n+{magicalDamage:mult} par \u003cb\u003eMÉCANISME\u003c/b\u003e allié.",
+  "54378": "",
+  "58312": "",
+  "50458": "Sinistro Astral",
+  "74121": "Construit un {ObjectMechanism:403} jusqu\u0027à {mechanismSpawnRange:c} de votre héros.\n\\---\nDétruit votre {ObjectMechanism:403} déjà en jeu.",
+  "33413": "Recyclage Horloger",
+  "89570": "Inflige {magicalDamage:dmg}.\n\\---\nPiochez votre prochain sort \u003cb\u003eSINISTRO\u003c/b\u003e s\u0027il n\u0027y a pas de \u003cb\u003eSINISTRO\u003c/b\u003e allié en jeu.",
+  "59460": "Razia de l\u0027Horloger",
+  "30333": "Inflige {magicalDamage:dmg}.\n\\---\nPiochez tous les sorts de \u003cb\u003eSINISTRO\u003c/b\u003e de votre pioche.",
+  "82904": "Rouage",
+  "63514": "Inflige \u003cif indeck\u003e{magicalDamage:dmg}\u003c/if\u003e\u003cif in fight\u003e{magicalDamage:total}\u003c/if\u003e.\n\\---\n{#EVOLVE}\\_: +{magicalDamage:mult} quand vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e.",
+  "54646": "Surcharge de Mécanisme",
+  "14749": "Un \u003cb\u003eMÉCANISME\u003c/b\u003e allié déclenche {explosion:ex} puis est détruit.",
+  "69393": "Midi Pile",
+  "813": "Déclenche le pouvoir des \u003cb\u003eMÉCANISMES\u003c/b\u003e alliés.",
+  "36853": "Grande Horlogerie",
+  "49404": "Inflige {magicalDamage:dmg}.\n\\---\nLe coût de ce sort est réduit de 1\\_{%pa} par \u003cb\u003eMÉCANISME\u003c/b\u003e en jeu.",
+  "91740": "Téléportation Astrale",
+  "47808": "Téléporte votre héros jusqu\u0027à {cell:c}.\n\\---\nApplique l\u0027état \u003cb\u003eASTRAL\u003c/b\u003e\u003csprite name\u003dastral/\u003e aux personnages adjacents\\_\u003csprite name\u003dcell_cross/\u003e à votre héros.",
+  "7528": "Téléportation Inversé",
+  "79912": "Échange la position de votre héros avec un allié ou un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.",
+  "50703": "Téléportation en Chaîne",
+  "4720": "Téléporte 2 fois votre héros jusqu\u0027à {cell:c} \u003cb\u003eOU\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around/\u003e d\u0027un \u003cb\u003eMÉCANISME\u003c/b\u003e allié.\n\\---\nInflige {magicalDamage:dmg} aux adversaires autour\\_\u003csprite name\u003dcell_around/\u003e de lui après chaque téléport.",
+  "65593": "Focus Astral",
+  "81824": "Votre héros gagne +{value:perc}% aux dégâts physiques pour le tour.\n\\---\nPiochez votre prochain sort de \u003cb\u003etéléportation\u003c/b\u003e.",
+  "37734": "Passé Planifié",
+  "30788": "Inflige {magicalDamage:dmg}.\n\\---\nDouble les dégâts si vous avez au moins {value:pa}\\_{%pa} dans votre réserve.",
+  "25548": "Rajeunissement",
+  "75026": "Consomme votre {%reserve}.\n\\---\nSoigne {heal:h} +{heal:mult} par {%pa} consommé.\n\\---\nPiochez 1\\_sort.",
+  "28160": "Destinée Funeste",
+  "19301": "Ajoute {addReserve:pa}.",
+  "737": "Garde Temps",
+  "65755": "Tue une entité adverse.",
+  "19462": "À bout portant",
+  "79264": "Inflige {value:dmg} et {#PUSH} de {cell:c} un personnage adjacent \u003csprite name\u003dcell_cross/\u003e à votre héros.\n\\---\nVotre héros recule de 2 cases.",
+  "88027": "Tir en cloche",
+  "32890": "Inflige {magicalDamage:dmg}.\n\\---\nVotre héros gagne {value:nb}\\_{#SIGHT[MIRES]} si aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "40196": "Trait Givrant",
+  "84494": "Inflige {value:dmg} dégâts et retire {value:(-nb)}\\_{%PM} à la cible pour le tour.",
+  "62639": "Tir Rapide",
+  "33329": "Inflige {magicalDamage:dmg} dégâts.\n\\---\nAjoute +{value:pa}\\_{%PA} à votre réserve si aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around\u003e de votre héros.",
+  "10177": "Inflige {magicalDamage:dmg} à un adversaire aligné à votre héros.\n\\---\nVotre héros est attiré jusqu\u0027à la cible.",
+  "73055": "Poing Grappin",
+  "71430": "Bumerang Final",
+  "92465": "Inflige {magicalDamage:dmg}.\n\\---\n{#BOUNCE} si vous n\u0027avez plus de sort en main.",
+  "49371": "Bumerang Infini",
+  "47977": "Inflige {magicalDamage:dmg}.\n\\---\nRenvoie ce sort en main si vous n\u0027avez plus de sort en main.",
+  "17896": "Lancer sans Fin",
+  "57400": "Inflige {magicalDamage:dmg}.\n\\---\nRéduit de 1\\_{%pa} le coût de ce sort de manière permanente quand vous le jouez.",
+  "99676": "Première Bourrasque",
+  "73846": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.\n\\---\nPlace le sort {Spell:712} dans votre main.",
+  "2770": "Seconde Bourrasque",
+  "77201": "Inflige {magicalDamage:dmg} et {#PUSH} de {cell:c}.\n\\---\nDétruit ce sort à la fin du tour ou quand vous le jouez.",
+  "50812": "Shuriken Précis",
+  "96419": "Inflige {magicalDamage:dmg}.\n\\---\nVotre héros gagne 1\\_{#SIGHT} si le coût de ce sort a été réduit.",
+  "43390": "Shuriken Allégé",
+  "28290": "Inflige {magicalDamage:dmg}.\n\\---\nAjoute {addReserve:pa} si le coût de ce sort a été réduit.",
+  "60276": "Échappatoire",
+  "6005": "Inflige {magicalDamage:dmg}.\n\\---\nConfère {#PHASE} pour le tour à votre héros s\u0027il est à moins de {cell:c} d\u0027un adversaire.",
+  "91336": "Permutation Rapide",
+  "85635": "Échange la position de votre héros avec celle d\u0027un personnage adjacent\u003csprite name\u003dcell_cross/\u003e.\n\\---\nConfère +{value:pm}\\_{%pm} pour le tour à votre héros.",
+  "34189": "Poing Véloce",
+  "11938": "Inflige des dégâts d\u0027un montant égal à l\u0027{%at} de votre héros à un personnage aligné avec lui.\n\\---\n{#ACCURACY}\\_: Votre héros rejoue son tour.",
+  "78761": "Poing Perforant",
+  "14371": "Inflige {magicalDamage:dmg} sur les cases devant votre héros.",
+  "78753": "Poing Téléguidé",
+  "10015": "Inflige des dégâts d\u0027un montant égal à l\u0027{%at} de votre héros.",
+  "45752": "Sac de Munition",
+  "54832": "Confère {value:nb}\\_{#SIGHT[MIRES]} à votre héros.\n\\---\nPiochez 1 sort.",
+  "11253": "Pluie de Balles",
+  "75533": "Inflige {magicalDamage:dmg} dans la zone \u003csprite name\u003dcell_around/\u003e ciblée.",
+  "85807": "Tir à Répétition",
+  "17789": "Inflige {magicalDamage:dmg}.\n\\---\n{#ACCURACY}\\_: Renvoie ce sort dans votre main.",
+  "68139": "Tranche de Jamon",
+  "74888": "Un \u003cb\u003eCochon\u003c/b\u003e ayant une \u003cb\u003eAURA\u003c/b\u003e inglige son {%AT} aux adversaire adjacents \u003csprite name\u003dcell_cross\u003e.",
+  "27324": "GiveWakfuOrStasis_Debug",
+  "13394": "+ {value:Wakfu} points de Wakfu.\n+ {value:Stasis} points de Stasis.",
+  "36801": "",
+  "69677": "",
+  "3837": "Votre héros \u003cb\u003echarge\u003c/b\u003e un personnage aligné et lui inflige {magicalDamage:dmg}.\n\\---\nConfère à votre héros {armor:ar} par case parcourue."
 }
\ No newline at end of file
diff --git a/data/json/dico/Summonings.json b/data/json/dico/Summonings.json
index 6f60180a1f2e06099bbebac91acd557fc7dd87b4..2c249827a275a18ce4d5c6605bf79222efa8d85f 100644
--- a/data/json/dico/Summonings.json
+++ b/data/json/dico/Summonings.json
@@ -1,10 +1,7 @@
 {
-  "868": "Summonings",
-  "11556": "Cochon Chunin",
+  "1036": "Summonings",
   "91064": "-1\\_{%pa} au coût de vos sorts.\n\\---\nNe peut pas attaquer.",
   "14946": "Âme Spectrale",
-  "48001": "Iop Légendaire",
-  "51811": "Apparition : Gagne autant de dégâts et de PM que de niveaux de Réserve dépensés.",
   "59119": "{#UNIQUE}\n\\---\n{#DEATHBLOW} : Confère 1\\_AURA à votre héros s\u0027il en possède une.",
   "9461": "Légendarus",
   "90089": "{#UNIQUE}\n\u003cb\u003eSORT\u003c/b\u003e : {Spell:19485}\n\u003cb\u003eATTAQUE\u003c/b\u003e : Piochez 1 sort.",
@@ -20,7 +17,7 @@
   "73281": "Bébé Tofu",
   "24759": "Jeune Tofu",
   "64003": "Ombre Repoussante",
-  "22153": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:711}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:c}.",
+  "22153": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:711}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {cell:c}.",
   "41585": "Ombre Huilée",
   "6019": "{#SHADOW}\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +1\\_{%at}\\vpar piège allié en jeu.",
   "11745": "Arbatarba",
@@ -28,14 +25,14 @@
   "30683": "Proctoss",
   "50172": "\u003cb\u003eMORT\u003c/b\u003e\\_: Pose un {FloorMechanism:1203} sur sa case.",
   "14253": "Blockmort",
-  "21027": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{armor:ar} ou +{blindage:bl} aux alliés autour \u003csprite name\u003dcell_around\u003e de lui.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Charge un ennemi aligné de {value:cmin} à {cell:cmax} et lui inflige son {%at}.",
+  "21027": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{armor:ar} ou +{blindage:bl} aux alliés autour \u003csprite name\u003dcell_around\u003e de lui.\\v\\---\nCharge un ennemi aligné de {value:cmin} à {cell:cmax} et lui inflige son {%at}.",
   "65582": "Kasimordo",
   "69970": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Se transforme en {ObjectMechanism:1964}.",
-  "64225": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Si possible, traverse les adversaires d\u0027une ligne en leur infligeant son {%at}.",
+  "64225": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si possible, traverse les adversaires d\u0027une ligne en leur infligeant son {%at}.",
   "53373": "Châtreuse",
-  "56404": "{range}\n\\---\nGagne +{attackBoost:at} quand un allié meurt.",
+  "56404": "{range}\n\\---\nGagne +{value:at}% aux dégâts physiques quand un allié meurt.",
   "65866": "Crogneur",
-  "35067": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Sacrifie un {Summoning:238} pour gagner son {%at} et se soigner de ses {%pv}.\n\\---\n\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e\\_: Pioche le sort {Spell:30697}.",
+  "35067": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Sacrifie un {Summoning:238} pour gagner {value:perc}% aux dégâts physiques et se soigner de ses {%pv}.\n\\---\n\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e\\_: Pioche le sort {Spell:30697}.",
   "22178": "Grignoteur",
   "16655": "Sale Bête Infâme",
   "73877": "{#UNIQUE}\n\u003cb\u003eMORT\u003c/b\u003e\\_: Piochez votre sort d\u0027{#CALL[APPEL]}.",
@@ -90,9 +87,9 @@
   "17708": "Lame du Tatoué",
   "64719": "{#UNIQUE}\nQuand un héros allié subit des dégâts, \\velle inflige son {%at} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle.",
   "65166": "Picoss",
-  "37685": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse d\u0027{value:min} à {cell:max}.",
+  "37685": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} d\u0027{value:min} à {cell:max}.",
   "57974": "Pinspoteur",
-  "47994": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Vole {value:h}\\_{%pv} et {attackBoost:at} à ses alliés.\n\\---\nAjoute {addReserve:pa} quand l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e est appliqué.",
+  "47994": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Vole {value:h}\\_{%pv} et {value:at}% de dégâts physiques à ses alliés.\n\\---\nAjoute {addReserve:pa} quand l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e est appliqué.",
   "45568": "Petit Tofu",
   "49995": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Se téléporte à {cell:tpRange} de la cible\\v et prend son {#AIRBORNE[ENVOL]}.",
   "99241": "Petite Horde",
@@ -104,13 +101,13 @@
   "34205": "Tofoune",
   "7936": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Soigne les autres alliés\\v de la valeur de son {%at}.\nPrend son {#AIRBORNE[ENVOL]} quand elle subit une \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "83690": "Tofu Ventripotent",
-  "70989": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{attackBoost:at} par allié {#AIRBORNE} jusqu\u0027à sa prochaine ATTAQUE.",
+  "70989": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{value:at}% de dégâts physiques par allié {#AIRBORNE} jusqu\u0027à sa prochaine ATTAQUE.",
   "91735": "Tofu Foutu",
   "75044": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Se téléporte de {cell:c} vers un adversaire {#FEATHERED}.\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: -2\\_{%PM} pour le tour si la cible est {#FEATHERED[PLUMÉE]}.",
   "33742": "Tofu Tonic",
   "99938": "\u003cb\u003eFIN DU TOUR ADVERSE\u003c/b\u003e\\_: Prend son {#AIRBORNE[ENVOL]} s\u0027il n\u0027a pas subit de dégâts.\nLes dégâts de ses \u003cb\u003eATTERRISSAGES BRUTAUX\u003c/b\u003e sont doublés.",
   "93086": "Vénérable Tofu",
-  "13431": "Invoque une Horde et s\u0027inflige {magicalDamage:dmg} quand une Horde meurt.\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: +{attackBoost:at} aux Hordes et applique {#FEATHERED} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "13431": "Invoque une Horde et s\u0027inflige {magicalDamage:dmg} quand une Horde meurt.\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: +{value:at}% de dégâts physiques aux Hordes et applique {#FEATHERED} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "64493": "Tofuventail",
   "92676": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Prend son {#AIRBORNE[ENVOL]}.\nApplique {#DISARMED!} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e quand il effectue un \u003cb\u003eATTERRISSAGE BRUTALE\u003c/b\u003e.",
   "69878": "Tofu Légendaire",
@@ -123,8 +120,6 @@
   "68701": "Ses attaques touchent tous les adversaires autour de lui.",
   "47922": "Pichon byssal",
   "18541": "Se transforme s\u0027il est {#WET}.",
-  "66414": "Pichon byssal",
-  "32618": "{#APPEARANCE}\\_: Gagne {value:a}\\_{#PICHONAURA[GOUTTES]} et {armor:ar}.\nSe détransforme quand il n\u0027a plus de {#PICHONAURA}.",
   "47399": "Pichon spadon",
   "82069": "Inflige son attaque quand il se fait attaquer.\nSe transforme s\u0027il est {#WET}.",
   "43325": "Bouftounu",
@@ -133,8 +128,6 @@
   "8563": "",
   "64213": "Pichon blurp",
   "16731": "Se transforme s\u0027il est {#WET}.",
-  "10196": "Pichon blurp",
-  "89605": "{#APPEARANCE}\\_: Gagne {value:a}\\_{#PICHONAURA[GOUTTES]} et {armor:ar}.\nSe détransforme quand il n\u0027a plus de {#PICHONAURA}.",
   "70895": "Poulp encreur",
   "59052": "",
   "74566": "Pichon lectrik",
@@ -150,25 +143,23 @@
   "2932": "Mortadella",
   "58162": "{#DIRTY}\n\\---\n\u003c/b\u003eFIN DU TOUR\u003c/b\u003e\\_:\\_Confère +1\\_AURA à un autre \u003cb\u003eCochon\u003c/b\u003e allié si elle a attaqué.",
   "8827": "Graton",
-  "42232": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:c}.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC}.",
+  "42232": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {cell:c}.",
   "27888": "Coppa le Copain",
-  "96785": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse les adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC}.",
+  "96785": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} les adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e de {cell:c}.",
   "57340": "Guerrier Boudeur",
-  "62487": "{#PORSHIDO}\n\\---\n{#CRITICAL}\\_: Rejoue son tour (1 max par tour).",
+  "62487": "{#PORSHIDO}\n\\---\n{#CRITICAL}\\_: Rejoue son tour (1 fois par tour).",
   "36047": "Chevalier de Parme",
-  "63013": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Gagne 1\\_\u003cb\u003eAURA COUP FATAL\u003c/b\u003e.\n\\---\nTue sa cible s\u0027il possède 3\\_\u003cb\u003eAURAS COUP FATAL\u003c/b\u003e.",
+  "63013": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Gagne 1\\_\u003cb\u003eAURA COUP FATAL\u003c/b\u003e.\nTue sa cible s\u0027il possède 3\\_\u003cb\u003eAURAS COUP FATAL\u003c/b\u003e.\n\\---\n\u003cb\u003eFIN DE TOUR\u003c/b\u003e : Perd ses \u003cb\u003eAURAS\u003c/b\u003e s\u0027il n\u0027a pas attaqué.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e : Confère +{attackBoost:att} et +{armor:ar} à ses alliés.",
   "74381": "Porigami",
-  "81023": "\u003cb\u003eCOUP CRITIQUE\u003c/b\u003e\\_: +1\\_AURA aux Cochons.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: +{value:perc}% d\u0027{%AT} aux Cochons.",
+  "81023": "\u003cb\u003eCOUP CRITIQUE\u003c/b\u003e\\_: Confère +1\\_AURA aux Cochons.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: +{value:perc}% de dégâts physiques aux Cochons.",
   "8755": "Jamon le Dragon-Cochon",
-  "65072": "",
+  "65072": "{#PORSHIDO}\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_+50% de dégats physiques aux autres \u003cb\u003eCochons\u003c/b\u003e ayant une {#aura}.\n\\---\n{#CRITICAL}\\_: Réduit l\u0027{%AT} de l\u0027adversaire de moitié pour le tour.",
   "85500": "Larbin",
   "82220": "{#ANGRYDRIVE}\\_: Double ses dégâts.",
   "91800": "Larbin Monté",
   "28858": "{#ANGRYDRIVE}\\_: Se déplace à travers sa cible et lui inflige {magicalDamage:dmg}.",
-  "89618": "Bouftou dégénéré",
-  "76122": "{#STARTTURN} : attaque une cible adjacente aléatoire.",
-  "70491": "Bardos le Désosseur",
-  "84108": "{#LIFESTEAL}\n+200% d\u0027{%at} si la cible est {#NECROSED[Nécrosée]} \u003csprite name\u003dgeneric_monster\u003e.",
+  "70491": "Blockmort Surin",
+  "84108": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère {#SHIELD} aux alliés adjacents \u003csprite name\u003dcell_cross/\u003e.\nCharge un ennemi aligné de {value:cmin} à {cell:cmax} et lui inflige son {%at}.",
   "6965": "Bworkette",
   "9280": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eAMOCHÉ\u003c/b\u003e\\_\u003csprite name\u003dgeneric_monster\u003e.\n\\---\n{#ANGRYDRIVE}\\_: Téléporte la cible autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle \\vet lui inflige {magicalDamage:dmg}.",
   "74322": "Traqueur",
@@ -178,7 +169,7 @@
   "34806": "Bworkokak",
   "57889": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eAMOCHÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e ou {#HUG} si la cible a l\u0027état \u003cb\u003eAMOCHÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.\n\\---\n{#ANGRYDRIVE}\\_: Gagne +{armor:ar}.",
   "4727": "Grô bwork",
-  "52451": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche les 2\\_cases devant lui.\n\\---\n{#ANGRYDRIVE}\\_: Gagne +{attackBoost:at} et +{value:pm}\\_{%pm}.",
+  "52451": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche les 2\\_cases devant lui.\n\\---\n{#ANGRYDRIVE}\\_: Gagne +{value:at}% de dégâts physiques et +{value:pm}\\_{%pm}.",
   "20741": "Sir Bergerax",
   "87198": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Téléporte les {Summoning:458[BOUFTOUS DE BERGER]} autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Pioche le sort {Spell:970} si 2\\_alliés sont autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "94380": "Bworky Pro Graisse",
@@ -191,12 +182,8 @@
   "5109": "\u003cb\u003eATTAQUE\u003c/b\u003e : applique {#PARASITE[PARASITÉ]}.\nMeurt à la fin du tour.",
   "59077": "Larve toxique",
   "13604": "{#CONTAGIOUS}\nMeurt à la fin du tour.",
-  "3928": "Arakne",
-  "26324": "\u003cb\u003eDEBUT DE TOUR\u003c/b\u003e : gagne 1 \u003cb\u003eTOILE\u003c/b\u003e.\nGagne {value:pm}\\_{%pm} si elle en possède déjà 3.",
   "9407": "Abrak\u0027 infesté",
   "78315": "\u003cb\u003eMORT\u003c/b\u003e : invoque une {Summoning:329}.\n\u003cb\u003eATTAQUE\u003c/b\u003e : inflige le double de dégâts si la cible est {#PARASITE[PARASITÉE]}.",
-  "20456": "Arakne renforcée",
-  "99434": "\u003cb\u003eMORT\u003c/b\u003e : invoque 1 {Summoning:9}.\n\u003cb\u003eDEBUT DU TOUR\u003c/b\u003e : gagne 1 \u003cb\u003eTOILE\u003c/b\u003e.\nGagne {value:ar}\\_{%ar} si elle en possède déjà 3.",
   "53759": "Tronk\u0027nid",
   "50903": "",
   "87081": "Abrak\u0027nid bagarreur",
@@ -205,8 +192,6 @@
   "96754": "\u003cb\u003eATTAQUE\u003c/b\u003e : applique {#CONTAGIOUS}.\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e : invoque une {Summoning:621}.",
   "83134": "Abraknyde toxique",
   "24464": "\u003cb\u003eATTAQUE\u003c/b\u003e : applique {#CONTAGIOUS}.\n\u003cb\u003eMORT\u003c/b\u003e : applique {#CONTAGIOUS} à tous les personnages \u003cb\u003eAUTOUR\u003c/b\u003e de lui.",
-  "71832": "Arak\u0027nid",
-  "20964": "\u003cb\u003eMORT\u003c/b\u003e : invoque 3 {Summoning:9[ARAKNES]}.\n\u003cb\u003eDEBUT DU TOUR\u003c/b\u003e : gagne 1 \u003cb\u003eTOILE\u003c/b\u003e.\nInvoque 1 {Summoning:9} s\u0027il en possède déjà 3.",
   "26739": "Araknode l\u0027Indésirable",
   "58808": "{#UNMOVABLE}\nSubit le double des dégâts au corps à corps.\nQuand elle subit une attaque, place le sort {Spell:20122\t} dans sa main.",
   "63692": "Anélide la Troncophore",
@@ -214,7 +199,7 @@
   "10771": "Sylvegore le Corrompu",
   "64062": "\u003cb\u003eMORT\u003c/b\u003e\\_: invoque 4 {Summoning:621}.",
   "69649": "Chef du clan",
-  "18427": "{#ANGRYDRIVE}\\_: Inflige le double de son {%at} aux adversaires autour\\_\u003csprite name\u003dcell_circle2\u003e de lui.\n\\---\nUn allié adjacent\\_\u003csprite name\u003dcell_cross\u003e subit les dégâts des \u003cb\u003eATTAQUES\u003c/b\u003e à sa place.",
+  "18427": "{#ANGRYDRIVE}\\_: Inflige le double de son {%at} aux adversaires jusqu\u0027à 2 cases\\_\u003csprite name\u003dcell_circle2\u003e de lui.\n\\---\nUn allié adjacent\\_\u003csprite name\u003dcell_cross\u003e subit les dégâts des \u003cb\u003eATTAQUES\u003c/b\u003e à sa place.",
   "48719": "Instructeur Cochon",
   "14180": "{#PORSHIDO}\n\\---\n{#CRITICAL}\\_: Confère +{value:a}\\_AURAS à un autre \u003cb\u003eCochon\u003c/b\u003e allié aléatoire.",
   "24866": "Costaure",
@@ -222,7 +207,7 @@
   "21778": "Grabataure",
   "80195": "Recule de {cell:c} quand il subit une \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "96572": "Empereur Guemene",
-  "73013": "{#PORSHIDO}\n\\---\nGagne +{attackBoost:at} pour le tour quand l\u0027{Summoning:966} subit des dégâts.\n\\---\n{#CRITICAL}\\_: Inflige +25% de dégâts.",
+  "73013": "{#PORSHIDO}\n\\---\nGagne +{value:at}% de dégâts physiques pour le tour quand l\u0027{Summoning:966} subit des dégâts.\n\\---\n{#CRITICAL}\\_: Inflige +25% de dégâts.",
   "67356": "",
   "6301": "Mandhal",
   "94519": "",
@@ -235,22 +220,18 @@
   "32248": "Prehistauric",
   "32527": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Recule de {value:c1} à {cell:c2}.",
   "77854": "Pubertaure",
-  "3827": "Attire de {cell:c} et confère +{attackBoost:at} aux alliés directement alignés quand il finit son déplacement.",
+  "3827": "Attire de {cell:c} et confère +{value:at}% de dégâts physiques aux alliés directement alignés quand il finit son déplacement.",
   "43936": "Taurino",
-  "60000": "Gagne +{attackBoost:at} quand il subit une \u003cb\u003eATTAQUE\u003c/b\u003e.",
+  "60000": "Gagne +{value:at}% de dégâts physiques quand il subit une \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "25454": "Taurrida",
-  "79750": "Taure Masqué",
-  "47042": "{#STARTTURN!}\\_: Pioche le sort {Spell:392}.",
   "93104": "Patriarche",
   "85009": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Se transforme en {Summoning:614} si la {%reserve} contient {value:r2}\\_{%PA}.\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Ajoute {addReserve:r}.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Le \u003cb\u003eChafer\u003c/b\u003e allié ayant le plus de {%pv}\\v se transforme en {Summoning:794}.",
   "66506": "Périgourdin",
-  "5746": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:c}.\n\\---\n{#COLLISION}\\_: {magicalDamage:dmgC} et applique {#STUN}.",
+  "5746": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {cell:c}.\n\\---\n{#COLLISION} : applique {#stun} à la cible.",
   "85480": "Protecteur Sacré",
   "31262": "{#PORSHIDO}\n\\---\n{#BODYGUARD} de la \u003cb\u003eFamille Impériale\u003c/b\u003e.\n\\---\n{#CRITICAL}\\_:\\_Applique {#STUN}.",
   "87485": "Patriarche Suprême",
   "4566": "\u003ci\u003ePatriarche transformé\u003c/i\u003e.",
-  "52791": "Tombe Oubliée",
-  "99930": "\u003cb\u003eMORT\u003c/b\u003e : Pose une {ObjectMechanism:1447} sur sa case de mort.",
   "60671": "Jon Kriz",
   "38882": "{#PORSHIDO}\n\\---\n{#CRITICAL}\\_: Inflige +25% de dégâts et se soigne de la valeur de son {%at}.",
   "96870": "Soldat Tripoux",
@@ -259,20 +240,12 @@
   "54567": "{#UNIQUE}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Soigne {Companion:350} et votre\\v héros d\u0027une valeur égale à son {%at}.\n\\---\nMeurt si {Companion:350} quitte le jeu.",
   "3427": "Impératrice Galantine",
   "34801": "Augmente les chances de {#CRITICAL[CRITIQUES MAGIQUES]} de +50%.\n\\---\n{#CRITICAL[COUP CRITIQUE MAGIQUE]}\\_: Ajoute {addReserve:pa}.",
-  "36015": "[NOT USED] Baron Roméro",
-  "39635": "+{attackBoost:at} quand un \u003cb\u003eCHAFER\u003c/b\u003e meurt.\nVous ne pouvez pas invoquer de compagnon durant ce combat.",
-  "64241": "Myriam feu la Jeune Mariée",
-  "28502": "{#INVULNERABLE}\n{#PHASE}",
-  "30272": "[NOT USED] Creuzar le Creuvar",
-  "28607": "{#UNTARGETABLE}",
   "43487": "Dragon Rouge",
   "50875": "",
   "91055": "Murène Électrique",
   "65183": "Déclenche une {#BOUNCE[Décharge]} autour d\u0027elle infligeant son {%at} quand elle subit des dégâts.",
   "39546": "Swamp Thing",
   "84298": "",
-  "46743": "PNJ TEST 1",
-  "54141": "\u003cb\u003eATTAQUE\u003c/b\u003e : achève les unités en dessous de {value:pv}\\_{%pv}",
   "63137": "Oeuf Gris",
   "92136": "{#DRAGEGG}.",
   "12629": "Oeuf Marron",
@@ -293,18 +266,6 @@
   "28264": "\u003cb\u003eATTAQUE\u003c/b\u003e : Touche les 3 cases devant elle.",
   "40724": "Mini Dragon Rouge",
   "12641": "{#DRAGEGG}.",
-  "89580": "Chacha Gourmet",
-  "54935": "+{armor:ar} quand un \u003cb\u003eTAURE\u003c/b\u003e meurt.",
-  "28828": "Fantôme Taure",
-  "62361": "{#INVULNERABLE}.\n{#STARTTURN!}\\_: Charge un adversaire en ligne à 2 ou 3 cases et lui inflige son {%AT}.",
-  "74708": "Lilian le Paysan",
-  "18763": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche tous les adversaires {#ADJACENT[ADJACENTS]!}.\nInflige {magicalDamage:dmg} aux Taures qui le chargent.\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:357}.",
-  "53613": "Dr. Francès Teigne",
-  "74969": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Soigne votre héros\\v d\u0027une valeur égale à son {%AT}.",
-  "87411": "Kriss Tandiore",
-  "60503": "{#UNTARGETABLE}\n{#DEATHBLOW}\\_: Tond un \u003cb\u003eBOUFTOU\u003c/b\u003e.",
-  "10147": "Bouftou",
-  "16999": "\u003cb\u003eATTAQUE\u003c/b\u003e : applique {#MUDDY}.",
   "90476": "Boufton",
   "66106": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Court vers un allié aligné.",
   "58258": "Bouflonne",
@@ -312,43 +273,35 @@
   "73286": "Jersey",
   "76575": "{#CRAQBOWLEUR}\n\u003cb\u003eDÉBUT DE TOUR\u003cb\u003e\\_:\\_Inflige son {%AR} en dégâts\\vaux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à lui.",
   "398": "Grand Laineux",
-  "79589": "Construit un {ObjectMechanism:451} la 1ère fois que {#PARASITIZED} est appliqué dans le tour.\nGagne +{attackBoost:at}\\vquand un adversaire joue une {Spell:104!}.",
+  "79589": "Construit un {ObjectMechanism:451} la 1ère fois que {#PARASITIZED} est appliqué dans le tour.\nGagne +{value:at}% de dégâts physiques\\vquand un adversaire joue une {Spell:104!}.",
   "44882": "Cornan le Cornu",
-  "82176": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique {#PARASITIZED}.\nConfère +{attackBoost:at} et +{armor:ar2} aux \u003cb\u003eBOUFTOUS\u003c/b\u003e\\v quand une {Summoning:979} meurt.",
+  "82176": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique {#PARASITIZED}.\nConfère +{value:at}% de dégâts physiques et +{armor:ar2} aux \u003cb\u003eBOUFTOUS\u003c/b\u003e quand une {Summoning:979} meurt.",
   "80925": "Bouftou de Combat",
-  "66450": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:x}.",
+  "66450": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {cell:x}.",
   "48178": "Dégénérescence",
   "10192": "{#SICK!}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle\\vet applique {#PARASITIZED}.",
   "59140": "Bouftou Adulte",
-  "96460": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{value:atmin} à {attackBoost:atmax}\\vsi 2\\_alliés sont autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "96460": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{value:perc}% de dégâts physiques si 2\\_alliés sont autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "69207": "Pupuce",
   "41773": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Se téléporte autour\\_\u003csprite name\u003dcell_around\u003e d\u0027un \u003cb\u003eBouftou\u003c/b\u003e.",
   "62296": "Dégénéré",
-  "27018": "{#SICK!}\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Déclenche une \u003cb\u003eATTAQUE\u003c/b\u003e.\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Gagne +{attackBoost:at}\\vsi la cible est {#PARASITIZED[PARASITÉE]} \u003csprite name\u003dgeneric_monster\u003e.",
+  "27018": "{#SICK!}\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Déclenche une \u003cb\u003eATTAQUE\u003c/b\u003e.\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Gagne +{value:at}% de dégâts physiques\\vsi la cible est {#PARASITIZED[PARASITÉE]} \u003csprite name\u003dgeneric_monster\u003e.",
   "63788": "Bouftou de Berger",
-  "13269": "Gagne +{attackBoost:at} par \u003cb\u003eBOUFTOU\u003c/b\u003e.",
-  "76137": "Jamon le Dragon-Cochon",
-  "52212": "",
-  "11476": "Colombe",
-  "47851": "Ne peut subir de dégât.\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse d\u00271 à 3 cases.",
+  "13269": "Gagne +{value:at}% de dégâts physiques par \u003cb\u003eBOUFTOU\u003c/b\u003e.",
   "13525": "Pustule de Dégénerescence",
   "77977": "",
-  "10603": "Dafnis le Berger",
-  "13359": "Immunisé aux \u003cb\u003eMORSURE\u003c/b\u003e et \u003cb\u003ePIÉTINEMENT\u003c/b\u003e.\nSauve les {Summoning:484[BOUFTONS]} qu\u0027il \u003cb\u003eATTAQUE\u003c/b\u003e.",
   "51194": "Fantassins de Bronze",
   "76167": "Quand un adversaire adjacent subit une attaque, inflige son {%at} s\u0027il prend la cible en {#TENAILLE}.",
   "7751": "Archers de Bronze",
   "11250": "{range}",
   "68403": "Baliste",
-  "32227": "{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Repousse de {cell:c}\\vsi la cible est alignée.",
+  "32227": "{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_{#PUSH} de {cell:c}\\vsi la cible est alignée.",
   "36275": "Chevalier Noir Monté",
   "57043": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique {#WHISPERED}\\v aux adversaires autour de lui.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Les adversaires {#WHISPERED[chuchotés]} \u003csprite name\u003dgeneric_monster\u003e \u003cb\u003eAUTOUR\u003c/b\u003e de lui attaquent un allié \u003cb\u003eAUTOUR\u003c/b\u003e d\u0027eux.\n\\---\nGagne +{armor:ar} quand {#WHISPERED} est appliqué.",
   "77941": "Sentinelle Craquelée",
   "28629": "\u003cb\u003eATTAQUE\u003c/b\u003e : Pose un {ObjectMechanism:201}\\vsur une case libre autour\\_\u003csprite name\u003dcell_around\u003e de la cible.",
   "20327": "Sentinelle Supérieure",
   "71647": "\u003cb\u003eDÉBUT DU TOUR :\u003c/b\u003e Gagne +{value:ar}\\_{%ar}\\vsi un adversaire est adjacent.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e : Pose un {ObjectMechanism:201}\\vautour\\_\u003csprite name\u003dcell_around\u003e de la cible.\n\\---\nTriple son {%at} si la cible est {#ROOTED[Immobilisée]}.",
-  "26929": "TODO",
-  "68840": "",
   "7495": "Chevalier Noir",
   "9136": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique {#WHISPERED}\\v aux adversaires autour de lui.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Les adversaires {#WHISPERED[chuchotés]} \u003csprite name\u003dgeneric_monster\u003e \u003cb\u003eAUTOUR\u003c/b\u003e de lui attaquent un allié \u003cb\u003eAUTOUR\u003c/b\u003e d\u0027eux.",
   "3320": "Chevalier Porté",
@@ -359,16 +312,14 @@
   "5046": "Quand un adversaire aligné subit une attaque, charge la cible et lui inflige son {%at}.",
   "54091": "Chevaliers d\u0027Or",
   "27135": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: Passe en {#OFFENSIVESTANCE} ou en {#DEFENSIVESTANCE}.",
-  "10320": "Chevalier Locelant",
-  "29186": "\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:368}.\n\u003cb\u003eDEBUT DE TOUR\u003c/b\u003e : +{value:ar}\\_{%ar} et {#SHIELD} autour de lui si un allié est autour.",
   "56685": "Fantassins Obscurs",
-  "68890": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Passe dans le dos de sa cible\\v et la repousse d\u0027une case.",
+  "68890": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Passe dans le dos de sa cible\\v et la {#PUSH} d\u0027une case.",
   "33222": "Tour Craquelée",
-  "22861": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e : Gagne +{attackBoost:at} et +{armor:ar}\\v tant que le rituel est actif.",
+  "22861": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e : Gagne +{value:at}% de dégâts physiques et +{armor:ar} tant que le rituel est actif.",
   "54413": "Conjurateurs Chuchoteurs",
   "16020": "{range}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Gagne un \\v{#PROTECTIVEWHISPER} si aucun\\v adversaire n\u0027est autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "92972": "Forteresse Royale",
-  "18282": "{#UNMOVABLE}\n\\---\nQuand elle atteint {armor:ar1} ou {armor:ar2}, elle devient {#STUN[ASSOMMÉE]} et gagne +{attackBoost:at}.",
+  "18282": "{#UNMOVABLE}\n\\---\nQuand elle atteint {armor:ar1} ou {armor:ar2}, elle devient {#STUN[ASSOMMÉE]} et gagne +{value:at}% de dégâts physiques.",
   "8670": "Boufpoux",
   "11254": "{#SICK!}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Invoque une {Summoning:979} \u003cb\u003eAUTOUR\u003c/b\u003e de lui.",
   "35238": "Crâne Roi",
@@ -385,44 +336,8 @@
   "6280": "{range}",
   "42096": "Archers d\u0027Argent",
   "98741": "{range}",
-  "91063": "Esprit vengeur",
-  "77719": "\u003cb\u003eATTAQUE\u003c/b\u003e : Tous les alliés prennent leur {#AIRBORNE[ENVOL]}.",
-  "37722": "Goss l\u0027Abandonné",
-  "87448": "\u003cb\u003eINVULNÉRABLE\u003c/b\u003e.",
-  "43702": "Épouvantail",
-  "56699": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse d\u0027une case.",
-  "13735": "Marnie",
-  "30355": "",
-  "6581": "Gardien des Mouettes",
-  "39164": "{#DEATHBLOW}\\_: Ajoute un point à la jauge élémentaire.\n\u003cb\u003eOBJET\u003c/b\u003e : Commence le combat avec 2 \u003cb\u003ePIOU\u003c/b\u003e aligné à 2 cases du Gardien.",
-  "11467": "Piou",
-  "78324": "",
   "96863": "croquasse",
   "91173": "\u003cb\u003eATTAQUE\u003c/b\u003e : Touche les 2 cases devant lui.",
-  "26801": "Craqueboule",
-  "21744": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {value:pm}\\_{%pm}.\n{#DEATH!}\\_: Construit un {ObjectMechanism:1607}.",
-  "38311": "Croqueur",
-  "67859": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Inflige son {%AT} + son {%AR}.\n{#APPEARANCE!}\\_: +{value:v}\\_{%AR}.\n{#DEATH!}\\_: Construit un {ObjectMechanism:1607}.",
-  "1240": "Craqueboule Orné",
-  "563": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#ROOTED[IMMOBILISE]!} s\u0027il y a au moins un {ObjectMechanism:569}.\n{#DEATH!}\\_: Construit un {ObjectMechanism:569}.",
-  "80182": "Craqueleur Orné",
-  "69066": "+1\\_{%PM} s\u0027il y a au moins un {ObjectMechanism:569}.\n{#DEATH!}\\_: Construit un {ObjectMechanism:569}.",
-  "53743": "Craquelanceur",
-  "36322": "\u003cb\u003ePortée : infini\u003c/b\u003e\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Peut construire un {ObjectMechanism:1044} sur une case {#AROUND!} de sa cible.\n{#DEATH!}\\_: Construit un {ObjectMechanism:1607}.",
-  "1369": "Craqueboule Élancé",
-  "35427": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Échange de place avec sa cible.\n{#DEATH!}\\_: Construit un {ObjectMechanism:1607}.",
-  "69105": "Fracasseur",
-  "9223": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#STUN[ASSOMME]!}.\n+1\\_{%PM} s\u0027il y a au moins un {ObjectMechanism:569}.\n{#DEATH!}\\_: Construit un {ObjectMechanism:569}.",
-  "7459": "Craquemousse",
-  "98250": "{range}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche aussi les adversaires {#ADJACENT[ADJACENTS]!} à la cible et applique {#WET!}.",
-  "13213": "Minerai Animé",
-  "97259": "Quand un {ObjectMechanism:1044} ou {ObjectMechanism:1607} est invoqué, il est transformé en {ObjectMechanism:569}.\n{addReserve:pa} quand un {ObjectMechanism:569} est détruit.",
-  "70754": "???",
-  "97192": "{#STARTTURN!}\\_: +{value:v}\\_{%AR} par {ObjectMechanism:1943} et -{value:v}\\_{%BL} à chaque {ObjectMechanism:1943}.",
-  "82944": "Craqueleur Légendaire",
-  "62171": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#STUN[ASSOMME]!}.\n{#STARTTURN!}\\_: Construit un ou deux {#CRAQUELOROC} aléatoire s\u0027il y en a moins de 5.\n+1\\_{%PM} par {#CRAQUELOROC}.",
-  "61980": "Rocqueur",
-  "77169": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#STUN[ASSOMME]!}.\n{#DEATH!}\\_: Construit un {ObjectMechanism:1607}.",
   "88645": "Mini Dragon Rouge",
   "71105": "{#DRAGEGG}.\n\u003cb\u003eATTAQUE\u003c/b\u003e : Applique {#VENTILATED!}.",
   "45691": "Dragon Bleu",
@@ -430,148 +345,49 @@
   "93470": "Dragon Vert",
   "66390": "Se téléporte et déclenche son attaque sur une cible qui attaque un {#DRAGEGG} (max 1 fois par tour).",
   "7424": "Dragon Marron",
-  "92701": "+{value:v}\\_{%AT} par {#DRAGEGG}.",
+  "92701": "+{value:v}% de dégâts physiques par {#DRAGEGG}.",
   "7021": "Roi Gélome",
   "5453": "{#FRUCTOSE}\\_(FRAMBOISE)\\_: Les alliés déclenchent {explosion:ex}.\n{#FRUCTOSE}\\_(CITRON)\\_: Invoque 2 \u003cb\u003eGELBIBIS\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around\u003e.\n{#FRUCTOSE}\\_(FRAISE)\\_: Fait évoluer les \u003cb\u003eGELBIBIS\u003c/b\u003e et les \u003cb\u003eGELINES\u003c/b\u003e.\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Se téléporte sur une case sucrée.",
-  "34982": "Disciple Iop",
-  "14266": "+{attackBoost:at1} et +1\\_\u003cb\u003eKI\u003c/b\u003e\\v quand vous avez {value:r2}\\_\u003csprite name\u003dfire\u003e,\u003csprite name\u003dwater\u003e,\u003csprite name\u003dwind\u003e,\u003csprite name\u003dearth\u003e ou \u003csprite name\u003dneutral\u003e.\nSe transforme quand vous avez {value:ki}\\_\u003cb\u003eKI\u003c/b\u003e.",
-  "28552": "Chuchoteur Effrayé",
-  "95772": "Recule de {cell:c} quand il subit une \u003cb\u003eATTAQUE\u003c/b\u003e.",
-  "52903": "Cochon Effrayé",
-  "30625": "Recule de {cell:c} quand il subit une \u003cb\u003eATTAQUE\u003c/b\u003e.\nS\u0027il se fait \u003cb\u003eELECTROCUTER\u003c/b\u003e, il devient {#ROOTED[IMMOBILISÉ]!}.",
-  "73430": "Craqueleur Évadé",
-  "85240": "",
-  "28091": "L\u0027indestructible",
-  "68832": "\u003cb\u003eINVULNÉRABLE\u003c/b\u003e.\nS\u0027il se fait \u003cb\u003eELECTROCUTER\u003c/b\u003e, il détruit les {FloorMechanism:1802} et devient \u003cb\u003eVULNÉRABLE\u003c/b\u003e pour le tour.",
-  "73421": "Coperfol",
-  "69993": "{#STARTTURN} : pioche un sort.",
-  "83286": "Flamboyante Kasaï",
-  "62199": "+1\\_{%pm} pour le tour\\v quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e.",
-  "43732": "Flamboyante Kasaï",
-  "3819": "+1\\_{%pm} pour le tour\\v quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e.",
-  "41593": "Le Chuchoteur de Maison",
-  "46679": "{#ENDTURN!} : -1 {%PM} aux joueurs et compagnons {#AROUND!} jusqu\u0027au début du prochain tour.",
-  "6663": "Princesse Cochon ligotée",
-  "84080": "{#STARTTURN!} : Si aucun adversaire n\u0027est {#AROUND!} d\u0027elle, confère {value:at}\\_{%at} à tous ses alliés et gagne {value:pm}\\_{%pm} pour le tour.",
-  "51405": "Cochonnet Genin",
-  "29027": "\u003cb\u003eATTAQUE\u003c/b\u003e : Double son {%at}.",
-  "71363": "Cochon Chunin",
-  "74618": "{#RIPOSTE}\\_({value:dmg}).\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.",
-  "29432": "Cochon Jonin",
-  "34575": "{#STARTTURN!} : Si un ennemi est aligné avec lui, charge jusqu\u0027à 7 cases dans sa direction et lui inflige son {%at}.",
-  "62652": "Rat d\u0027Eau",
-  "55289": "\u003cb\u003eATTAQUE\u003c/b\u003e : Inflige le double de dégats\\v si la cible est {#WET!}.",
   "12231": "Rat Doter",
   "77544": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e\\v\nou {#INFECTED} si la cible a l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e.",
   "85988": "Huitre",
   "33224": "",
-  "20252": "Summonings",
+  "20252": "02",
   "79914": "",
-  "45803": "Summonings",
+  "45803": "03",
   "91273": "",
-  "66112": "Summonings",
+  "66112": "04",
   "68789": "",
-  "13471": "Summonings",
+  "13471": "06",
   "76311": "",
-  "55007": "Summonings",
+  "55007": "07",
   "34390": "",
-  "46620": "Summonings",
+  "46620": "07",
   "63984": "",
-  "60938": "Summonings",
+  "60938": "09",
   "58426": "",
-  "62799": "Summonings",
+  "62799": "10",
   "69678": "",
-  "69031": "Summonings",
+  "69031": "11",
   "26557": "",
-  "87276": "Summonings",
+  "87276": "12",
   "14188": "",
-  "20493": "Ami du Chuchoteur",
-  "54370": "Fuit quand il fait une grosse bêtise.",
-  "9967": "Ami du Chuchoteur",
-  "36182": "Fuit quand il fait une grosse bêtise.",
-  "71094": "Ami du Chuchoteur",
-  "53402": "Fuit quand il fait une grosse bêtise.",
-  "6699": "Cochonnet Genin",
-  "26358": "\u003cb\u003eATTAQUE\u003c/b\u003e : Double son {%at}.",
-  "13417": "Cochon Chunin",
-  "12603": "{#RIPOSTE}\\_({value:dmg}).\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.",
-  "90054": "Champion Chucho",
-  "78417": "",
-  "10149": "Chucho Amateur",
-  "6234": "",
-  "90026": "Entraineur Chucho",
-  "41497": "",
-  "48695": "Cochon Chunin",
-  "90463": "{#RIPOSTE}\\_({value:dmg}).\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.",
-  "27181": "Cochon Chunin",
-  "18918": "{#RIPOSTE}\\_({value:dmg}).\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.",
-  "60096": "Cochon Chunin",
-  "85183": "{#RIPOSTE}\\_({value:dmg}).\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.",
-  "74956": "{#RIPOSTE}\\_({value:dmg}).\n\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.",
-  "11539": "Cochon Jonin",
-  "82362": "{#STARTTURN} : Si un ennemi est aligné, charge jusqu\u0027à 7 cases dans sa direction et inflige son {%at}.",
-  "91414": "Filllette des Égouts",
-  "41510": "{#ENDTURN!} : Récupère {heal:h} par allié {#AROUND!} d\u0027elle.",
-  "40536": "Le Ravageur",
-  "30228": "S\u0027il se fait \u003cb\u003eELECTROCUTER\u003c/b\u003e, il détruit  les {FloorMechanism:1802} et perd 6\\_{%PA} jusqu\u0027à la fin de son tour.",
-  "53509": "Alliance d\u0027Évadés",
-  "27777": "\u003cb\u003eINCAPTURABLE\u003c/b\u003e",
-  "85248": "Princesse Cochon",
-  "85695": "\u003cb\u003eATTAQUE\u003c/b\u003e : Repousse de {cell:c}.\nPeut jouer 2 fois par tour.",
-  "18240": "Proctoss",
-  "94339": "\u003cb\u003eMORT\u003c/b\u003e\\_: Pose un {FloorMechanism:576} sur sa case.",
+  "10149": "Avorton Pikaross",
+  "6234": "Confère +{value:mp}% aux dégâts des sorts Chafers.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Se téléporte de {value:cmin}⣻à {cell:cmax} de la cible.",
+  "48695": "Karab",
+  "90463": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +1\\_{%PM} si aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around\u003e.",
   "48215": "Chef de Guerre",
-  "41980": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si 2\\_alliés sont autour\\_\u003csprite name\u003dcell_around\u003e de lui,\\vleur confère +{attackBoost:at}.",
-  "13428": "Forgeron",
-  "14430": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Active la \u003cb\u003eFORGE\u003c/b\u003e ciblée.",
-  "70684": "Craqueleur",
-  "90295": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#STUN[ASSOMME]} la cible.\n{#ENDTURN}\\_: S\u0027applique {#PETRIFY} jusqu\u0027à son tour.",
-  "51814": "Forgeron",
-  "45770": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: 30% de chance d\u0027{#STUN[ASSOMMER]} la cible.",
-  "43141": "Arme Shushutée",
-  "67035": "Seul le FORGERON peut la tuer.\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Vole 1 \u003csprite name\u003dneutral\u003e, \u003csprite name\u003dfire\u003e, \u003csprite name\u003dwater\u003e, \u003csprite name\u003dwind\u003e ou \u003csprite name\u003dearth\u003e.\n\u003cb\u003eMORT\u003c/b\u003e\\_: Devient docile.",
+  "41980": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si 2\\_alliés sont autour\\_\u003csprite name\u003dcell_around\u003e de lui, leur confère +{value:at}% de dégâts physiques.",
   "71787": "Nouvelle Recrue",
-  "40979": "\u003cb\u003eCOUP CRITIQUE\u003c/b\u003e\\_: +1\\_AURA aux Cochons.\n\u003cb\u003eMORT\u003c/b\u003e\\_: +{value:perc}% d\u0027{%AT} aux Cochons.",
-  "42487": "Arme Shushutée Docile",
-  "95460": "",
-  "59884": "Automate Détraqué",
-  "56197": "Seul le FORGERON peut le tuer.\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Inflige son {%at} + son {%ar} en dégâts.\n{#STARTTURN}\\_: +{armor:ar}.\n\u003cb\u003eMORT\u003c/b\u003e\\_: N\u0027est plus détraqué.",
-  "90064": "Automate",
-  "75317": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Inflige son {%at} + son {%ar} en dégâts.\n\u003cb\u003eMORT\u003c/b\u003e\\_: Se détraque.",
-  "24283": "Forgeron",
-  "2830": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: +{armor:ar} à l\u0027AUTOMATE ciblé.",
-  "25807": "Minicri",
-  "87682": "\u003cb\u003eATTAQUE\u003c/b\u003e : +{value:at}\\_{%AT} à la cible pour le tour.\n{#ENDTURN!} : subit {magicalDamage:dmg}.",
-  "12924": "Forgeron",
-  "84909": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: +{armor:ar} à l\u0027AUTOMATE ciblé.",
-  "12785": "Ingénieur Xelor",
-  "1417": "\u003cb\u003eATTAQUE\u003c/b\u003e : Confère autant d\u0027{%AR} qu\u0027il a d\u0027{%AT} à lui et son automate.",
-  "63883": "Ta l\u0027Automate",
-  "70563": "+{value:at}\\_{%AT} et +{value:pm}\\_{%PM} quand un Craqueleur Composé meurt.\n{#ENDTURN!} : +{armor:ar} par Craqueleur Composé {#AROUND!} de lui.",
-  "73741": "Tic l\u0027Automate",
-  "10898": "+{value:at}\\_{%AT} et +{value:pm}\\_{%PM} quand un {Summoning:298} meurt.",
-  "33068": "Lion Kofman",
-  "21916": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e: Attire d\u00271 case les personnages alignés avec lui.",
-  "73145": "Eaudile",
-  "16032": "\u003cb\u003eATTAQUE\u003c/b\u003e : Touche les adversaires {#AROUND!} si elle est {#WET!}.\n-{value:pm}\\_{%PM} et +{value:at}\\_{%AT} si elle est {#WET!}.",
-  "92221": "Dentiste",
-  "98469": "+{armor:ar} quand il détruit un {ObjectMechanism:569}.\n{#STARTTURN} : Se téléporte de {cell:c} s\u0027il a plus d\u0027un adversaire sur ses cases {#ADJACENT!}.",
-  "6284": "[NOT USED] Obléro",
-  "63358": "{#DEATHBLOW} : +{attackBoost:at}",
-  "44013": "Hochos Bochos",
-  "78992": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Copie le sort le moins cher de la main d\u0027un adversaire aléatoire\\vet réduit son coût à 0\\_{%pa}.\n\u003cb\u003eMORT\u003c/b\u003e\\_: Se transforme en {ObjectMechanism:1964}.",
-  "580": "San Toku",
-  "85554": "{range}.\n{#DEATHBLOW}\\_: Copie le sort le plus cher de la main de l\u0027adversaire et réduit son coût à 0\\_{%pa}",
+  "40979": "\u003cb\u003eCOUP CRITIQUE\u003c/b\u003e\\_: Confère +1\\_AURA aux Cochons.\n\u003cb\u003eMORT\u003c/b\u003e\\_: +{value:perc}% de dégâts physiques aux Cochons.",
+  "44013": "Kasimordo Surin",
+  "78992": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Gagne +{value:a}% aux dégâts physiques.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Se transforme en {ObjectMechanism:325}.",
+  "580": "Crogneur Surin",
+  "85554": "{range}\n\\---\nGagne +{value:at}% aux dégâts physiques quand il subit des dégâts.",
   "6415": "Dragon Blanc",
   "44124": "",
-  "21508": "Edith Gré",
-  "62372": "\u003cb\u003eATTAQUE\u003c/b\u003e : repousse de {value:min} à {cell:max}.",
   "50046": "Bouflépreuse",
   "34984": "{#SICK!}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Donne une {Spell:104!}\\vaux ennemis adjacents\\_\u003csprite name\u003dcell_cross\u003e.",
-  "91906": "Loup",
-  "82830": "",
-  "31896": "Chef de Meute",
-  "74231": "\u003cb\u003eAPPARITION\u003c/b\u003e\\_: +{value:pm}\\_{%pm} aux invocations alliés pour le tour.",
   "20569": "Avorton Chafer",
   "92706": "Réduit de 1\\_{%PA} le coût des sorts.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Se téléporte de {value:cmin} à {cell:cmax} de la cible.",
   "47266": "Gelbibi Framboise",
@@ -587,7 +403,7 @@
   "20912": "Geline Arc-En-Ciel",
   "62900": "\u003cb\u003eATTAQUE\u003c/b\u003e : Active l\u0027effet {#FRUCTOSE} \\vde la cible si possible.",
   "55387": "Cubo-Gelée",
-  "87412": "Invoque une \u003cb\u003eGELBIBI\u003c/b\u003e de saveur aléatoire autour\\_\u003csprite name\u003dcell_around\u003e et {attackBoost:at} quand il perd 25% de ses {%pv}.",
+  "87412": "Invoque une \u003cb\u003eGELBIBI\u003c/b\u003e de saveur aléatoire autour\\_\u003csprite name\u003dcell_around\u003e et {value:at}% de dégâts physiques quand il perd 25% de ses {%pv}.",
   "71826": "Gelbibi Citron",
   "38035": "\u003cb\u003eATTAQUE\u003c/b\u003e : Se téléporte sur une case sucrée.\n{#FRUCTOSE}\\_: Évolue en {Summoning:838}.",
   "35083": "Gelbibi Fraise",
@@ -601,139 +417,139 @@
   "10308": "Gelée Fraise",
   "87960": "{#FRUCTOSE}\\_: Fait évoluer une \u003cb\u003eGELBIBI\u003c/b\u003e ou une \u003cb\u003eGELINE\u003c/b\u003e autour\\_\u003csprite name\u003dcell_around\u003e.",
   "87377": "Ninjadine",
-  "26081": "{#PORSHIDO}\n\\---\n\u003cb\u003eDÉUT DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente à l\u0027adversaire ayant le moins d\u0027{%at}.\n\\---\nSe téléporte à 5 cases de la cible\\vaprès une attaque.\n\\---\nDisparait en fin de tour.",
+  "26081": "{#PORSHIDO}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente à l\u0027adversaire ayant le moins d\u0027{%at}.\n\\---\nSe téléporte à 5 cases de la cible\\vaprès une attaque.\n\\---\nDisparait en fin de tour.",
   "77695": "Nounours",
   "20749": "\u003cb\u003eATTAQUE\u003c/b\u003e : Applique {#GLYCEMIA}.\n\u003cb\u003eMORT\u003c/b\u003e\\_: Ajoute une {Spell:382} dans la main de son bourreau.",
   "71250": "Croco Mou",
   "36875": "\u003cb\u003eATTAQUE\u003c/b\u003e : Ajoute une {Spell:382} dans la main de la cible si elle est {#GLYCEMIA[GLYCÉMIQUE\\_\u003csprite name\u003dgeneric_monster\u003e]]}.",
   "52550": "Drabonbon",
   "30260": "{#DEATHBLOW}\\_: Ajoute un {Spell:450} dans la main de la cible.",
-  "44089": "Mai Shiragrouik",
-  "64090": "{#PORSHIDO}\n-\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente à l\u0027adversaire ayant le moins d\u0027{%at}.\n-\nSe téléporte à 5 cases de la cible\\vaprès une attaque\n-\nA 50% de {%pv}\\_:\\_Créer un {#DOUBLE}",
-  "77077": "Lester",
-  "78831": "{#LIFESTEAL}\nAprès une attaque\\_: \\vse téléporte à 4 cases de la cible.",
-  "5643": "Kiro",
-  "87829": "{range}.",
-  "67787": "L\u0027Évideur",
-  "17453": "+200% d\u0027{%at} si la cible est {#NECROSED[Nécrosée]} \u003csprite name\u003dgeneric_monster\u003e.",
-  "39343": "Hocho la Dépeceuse",
-  "96913": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à l\u0027adversaire ayant le moins d\u0027{%at}.",
-  "1788": "Gnokoss",
-  "60577": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Soigne ses alliés\\vd\u0027une valeur égale à son {%at}.",
-  "66239": "Mossaka",
-  "75618": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Vol 1 {%pa} à la {%reserve} de la cible.",
+  "44089": "Coppa le Copain Ninja",
+  "64090": "{#PORSHIDO}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e : Retire 1\\_{%PM} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui pour le tour.",
+  "77077": "Avorton Surin",
+  "78831": "Confère +{value:bo}% aux dégats physiques des Chafers.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Se téléporte de {value:cmin} à {cell:cmax} de la cible.",
+  "5643": "Arbatarba Surin",
+  "87829": "{range}\n\\---\\\nAPPARITION\\_: {value:v}\\_{#NECROTICBOLT[TRAITS NÉCROTIQUES]}.",
+  "67787": "Picoss Surin",
+  "17453": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {value:min} à {cell:max}.\n{#ROOTED[IMMOBILISE]} la cible si elle a l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
+  "39343": "Châtreuse Surin",
+  "96913": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si possible, traverse les adversaires d\u0027une ligne en leur infligeant son {%at}.\n\\---\nGagne {#UNTARGETABLE} jusqu\u0027à la fin du tour quand elle subit des dégâts.",
+  "1788": "Proctoss Pikaross",
+  "60577": "\u003cb\u003eMORT\u003c/b\u003e\\_: Pose un {FloorMechanism:1400} sur sa case.",
+  "66239": "Picoss Pikaross",
+  "75618": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {value:min} à {cell:max}.\nRetire 1\\_{%pa}⣬à la {%reserve} de la cible si elle a l\u0027état \u003cb\u003eNÉCROSÉ\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
   "73665": "Comte Moross",
-  "25291": "Après un mouvement, les alliés autour\\_\u003csprite name\u003dcell_around\u003e gagnent {#UNTARGETABLE} jusqu\u0027au prochain tour.\n+{attackBoost:at} et +{armor:ar} quand un allié meurt.\n-\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:863}",
+  "25291": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Invoque un {Summoning:701} sur une case adjacente\u003csprite name\u003dcell_cross/\u003e à une {ObjectMechanism:249}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique {frozen:PropertyEffect.26.FrozenDmg} à la cible.",
   "19562": "Comte Mélankar",
-  "26573": "{#LIFESTEAL}\n+{value:at}% à l\u0027{%at} des alliés.\n-\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:36117}",
-  "49198": "Oscargne",
-  "56363": "{range}.\nArrive en jeu avec 3\\_{#FROZENBOLT[TRAITS DE GLACE]}.",
-  "26206": "Krouktos",
-  "62445": "Rejoue une fois son tour après avoir attaqué.\nApplique {#STUN} si la cible est {#NECROSED[Nécrosée]} \u003csprite name\u003dgeneric_monster\u003e.",
-  "42129": "Castresse la Frigide",
-  "84603": "\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Se Téléporte sur une case adjacente à l\u0027adversaire ayant le moins de {%pv}.",
-  "93886": "Aligore le Fragile",
-  "71422": "\u003cb\u003eMORT\u003c/b\u003e\\_: Applique {frozen:PropertyEffect.26.FrozenDmg} aux adversaires autour \u003csprite name\u003dcell_around\u003e de lui et se transforme en {ObjectMechanism:1964}.",
-  "26155": "Bolos-le-Niais",
-  "73938": "{range}.\n+100% aux dégâts du {#frozen[Gel]} tant qu\u0027il est en jeu.",
+  "26573": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Invoque un {Summoning:701} sur une case adjacente\u003csprite name\u003dcell_cross/\u003e à une {ObjectMechanism:249}.\n\\---\n{Summoning:701} est détruit.",
+  "49198": "Arbatarba Pikaross",
+  "56363": "{range}\n\\---\n\u003cb\u003eAPPARITION\u003c/b\u003e\\_: {value:a}\\_{#FROZENBOLT[TRAITS DE GLACE]}.",
+  "26206": "Blockmort Pikaross",
+  "62445": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Charge un ennemi aligné de {value:cmin} à {cell:cmax} et lui inflige son {%at}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Retire 1\\_{%pa} à la {%reserve} de la cible.",
+  "42129": "Châtreuse Pikaross",
+  "84603": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Si possible, traverse les adversaires d\u0027une ligne en leur infligeant son {%at}.\n\\---\nGagne +{armor:ar} quand un adversaire utilise sa {%reserve}.",
+  "93886": "Kasimordo Pikaross",
+  "71422": "Pose un {ObjectMechanism:1942} autour\\_\u003csprite name\u003dcell_around\u003e de lui quand un adversaire utilise sa {%reserve}.\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Se transforme en {ObjectMechanism:409}.",
+  "26155": "Crogneur Pikaross",
+  "73938": "{range}\n\\---\nGagne +{value:at}% aux dégâts physiques quand un adversaire utilise sa réserve.",
   "92185": "Liche Azundor",
-  "35131": "{range}.\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Applique {frozen:PropertyEffect.26.FrozenDmg} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e.\n-\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:36618}",
+  "35131": "{range}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Applique {frozen:PropertyEffect.26.FrozenDmg} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e.\n\\---\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:36618}",
   "16910": "Liche Horrorthon",
-  "12787": "{range}.\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique {#NECROSED}.\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Applique {#ROOTED[Immobilisé]} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e et repousse d\u0027une case.\n-\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:36461}",
+  "12787": "{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique {#NECROSED}.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Applique {#ROOTED[Immobilisé]} aux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e et {#PUSH} d\u0027une case.\n\\---\n\u003cb\u003eSORT\u003c/b\u003e\\_: {Spell:36461}",
   "30278": "Érog le Profanateur",
-  "14284": "+{armor:ar} et {#SHIELD} à un Avorton\\vquand il arrive en jeu.\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Pioche un sort.",
+  "14284": "+{armor:ar} et {#SHIELD} à un Avorton\\vquand il arrive en jeu.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Pioche un sort.",
   "98348": "Azor l\u0027Exécuteur",
-  "40989": "+{attackBoost:at} et +{armor:ar} aux alliés\\vquand il tue un allié.\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_:\\_Inflige son {%at} autour de lui.",
+  "40989": "+{value:at}% de dégâts physiques et +{armor:ar} aux alliés quand il tue un allié.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Inflige son {%at} autour de lui.",
   "86719": "Sor-Sucrerie",
   "88059": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_(PAIR)\\_: Inflige {magicalDamage:dmg} aux adversaires sur des cases sucrées.\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_(IMPAIR)\\_: Inflige {magicalDamage:dmg} aux adversaires qui ne sont pas sur des cases sucrées.",
   "39812": "Lieutenant Carie",
-  "83012": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Pioche le prochain \u003cb\u003eBLÂME\u003c/b\u003e.\n+{value:at}\\_{%AT} aux alliés pour le tour quand un \u003cb\u003eBLÂME\u003c/b\u003e est joué.",
-  "18723": "Yoshigrouitsu",
-  "75489": "{#PORSHIDO}\n{#STRIKEATTACK[TIR ˃LAIR]}\n-\n{range}\n-\n{#CRITICAL} : Gagne inciblable pour un tour.",
-  "11133": "Shrouidder",
-  "28204": "{#PORSHIDO}\n-\n{#STRIKEATTACK} : Se téléporte sur une case adjacente à la dernière cible touchée.\nGagne +{armor:ar} par cible touchée.",
-  "23639": "Grouik Smoke",
-  "22686": "{#PORSHIDO}\n-\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Pose un {FloorMechanism:1867} \\v à deux cases de distance (1 max).\n-\n{#CRITICAL}\\_:\\_Gagne +{attackBoost:at}.",
-  "78878": "Grouyu Hayabusa",
-  "4839": "{#PORSHIDO}\n-\n{#STRIKEATTACK} : Se téléporte sur une case adjacente à la dernière cible touchée.\nInflige {magicalDamage:dmg} suppl. pour chaque cible touchée.",
+  "83012": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Pioche le prochain \u003cb\u003eBLÂME\u003c/b\u003e.\n+{value:at}% de dégâts physiques aux alliés pour le tour quand un \u003cb\u003eBLÂME\u003c/b\u003e est joué.",
+  "18723": "Soldat Tripoux Ninja",
+  "75489": "{#PORSHIDO}\n\\---\n{range}\n\\---\nGagne +{value:ppow}% aux dégats physiques pour le tour si un allié à portée subit des dégâts.",
+  "11133": "Disciple Cochonnet Ninja",
+  "28204": "{#PORSHIDO}\n\\---\n\u003cb\u003eFIN DU TOUR \u003c/b\u003e\\_: Gagne {#UNTARGETABLE} pour le tour si un allié est autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "23639": "Graton Ninja",
+  "22686": "{#PORSHIDO}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:  Se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross/\u003e à un allié aléatoire.",
+  "78878": "Instructeur Cochon Ninja",
+  "4839": "{#PORSHIDO}\n\\---\nConfère une \u003cb\u003eAURA\u003c/b\u003e à un allié autour\\_\u003csprite name\u003dcell_around/\u003e de lui quand il subit des dégâts.",
   "23893": "Bworkakorn",
-  "94525": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{value:ar}\\_{%AR} aux alliés jusqu\u0027à 2 cases.\n\\---\n{#ANGRYDRIVE}\\_: Confère +{value:at}\\_{%AT} aux alliés jusqu\u0027à 2 cases.",
-  "37605": "Freddy Grouiger",
-  "96474": "{#DIRTY}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique l\u0027état {#BATSU}.\n-\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:\\_Pose un {FloorMechanism:1500} sur une case adjacente (3 max).",
-  "55009": "Pigsaw",
-  "48297": "{#DIRTY}\n-\n{range}\n-\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Téléporte l\u0027adversaire à portée ayant le moins de {%pv} à son corps à corps.",
-  "28713": "Carnibal Lecter",
-  "39798": "{#DIRTY}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique {fractured:PropertyEffect.42.FracturedDmg}.\n-\nGagne +100% d\u0027{%at} si la cible est {#BATSU}.",
-  "3387": "Porman Bates",
-  "5360": "{#DIRTY}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_+2 Auras à un autre allié aléatoire\\vsi la cible est {#BATSU}.",
-  "80564": "Gralex Lelarge",
-  "88606": "{#DIRTY}\n-\n\u003cb\u003eAPRES UNE ATTAQUE\u003c/b\u003e\\_:\\_Projette la cible dans un piège ou au corps à corps\\vde l\u0027allié ayant le plus d\u0027{%AT}.",
-  "98103": "Grack Torrance",
-  "34359": "{#DIRTY}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_-1\\_{%pm} et repousse d\u0027autant de case qu\u0027il possède d\u0027aura.\n-\n{#COLLISION} : {magicalDamage:dmgC}.",
-  "82585": "Grannie Wilkes",
-  "20522": "{#DIRTY}\n-\nGagne +100% d\u0027{%AT} si la cible est {#FRACTURED[FRACTURÉE]}. [NEED DEV]\n-\nConfère +100% aux dégâts de {#FRACTURED}\\vtant qu\u0027elle est en jeu.",
-  "92689": "Orochimagrouik",
-  "17641": "{#PORSHIDO}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Gagne {#SHIELD}\\vsi la cible est {#BATSU}.\n-\n{#CRITICAL}\\_:\\_Créer un {#DOUBLE} (1 max à la fois).",
+  "94525": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{value:ar}\\_{%AR} aux \u003cb\u003eBworks\u003c/b\u003e alliés jusqu\u0027à 2 cases.\n\\---\n{#ANGRYDRIVE}\\_: Confère +{value:at}% de dégâts physiques aux \u003cb\u003eBworks\u003c/b\u003e alliés jusqu\u0027à 2 cases.",
+  "37605": "Disciple Cochonnet Boucher",
+  "96474": "{#DIRTY}\n\\---\nApplique l\u0027état \u003cb\u003eBATSU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e aux adversaires autour\\_\u003csprite name\u003dcell_around/\u003e de lui quand il subit des dégâts.",
+  "55009": "Soldat Tripoux Boucher",
+  "48297": "{#DIRTY}\n\\---\n{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Téléporte la cible sur une case adjacente\\_\u003csprite name\u003dcell_cross/\u003e s\u0027il a plus de {value:perc}% de ses {%pv}.",
+  "28713": "Graton Boucher",
+  "39798": "{#DIRTY}\n\\---\nsi la cible est \u003cb\u003eBATSU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e.",
+  "3387": "Instructeur Cochon Boucher",
+  "5360": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Confère +1\\_\u003cb\u003eAURA\u003c/b\u003e à un \u003cb\u003eCochon\u003c/b\u003e allié aléatoire s\u0027il a plus de {value:perc}% de ses {%PV}.",
+  "80564": "Coppa le Copain Boucher",
+  "88606": "{#DIRTY}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Inflige {value:dmg}% de son {%at} aux adversaires autour \u003csprite name\u003dcell_around/\u003e de lui.",
+  "98103": "Guerrier Boudeur",
+  "34359": "{#DIRTY}\n\\---\nGagne +{value:att}% aux dégâts physiques tant qu\u0027il a plus de {value:pv}% de ses {%PV}.",
+  "82585": "Mortadella Boucher",
+  "20522": "{#DIRTY}\n\\---\n{#DEATHBLOW} : Confère +2\\_\u003cb\u003eAURAS\u003c/b\u003e à un \u003cb\u003eCochon\u003c/b\u003e allié aléatoire.",
+  "92689": "Guerrier Boudeur Ninja",
+  "17641": "{#PORSHIDO}\n\\---\nGagne +{value:ar}\\_{%AR} quand un allié autour\\_\u003csprite name\u003dcell_around/\u003e de lui subit des dégâts.",
   "66353": "Double d\u0027Orochimagrouik",
-  "9824": "{#PORSHIDO}\n{#DOUBLE}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Gagne {#SHIELD}\\vsi la cible est {#BATSU}.",
-  "39973": "Double de Mai Shiragrouik",
-  "82432": "{#PORSHIDO}\n{#DOUBLE}\n-\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente à l\u0027adversaire ayant le moins d\u0027{%at}.\n-\nSe téléporte à 5 cases de la cible\\vaprès une attaque.",
-  "77217": "Maki Gengrouisai",
-  "16444": "{#PORSHIDO}\n-\n{range}\n-\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Attire la cible si elle est alignée.\n-\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:\\_Confère +1 Aura à un autre allié aléatoire si un ennemi est adjacent.",
+  "9824": "{#PORSHIDO}\n{#DOUBLE}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Gagne {#SHIELD} si la cible a l\u0027état \u003cb\u003eBATSU\u003c/b\u003e\u003csprite name\u003dgeneric_monster\u003e.",
+  "39973": "Double de Coppa le Copain Ninja",
+  "82432": "{#PORSHIDO}\n{#DOUBLE}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à l\u0027adversaire ayant le moins d\u0027{%at}.\n\\---\nSe téléporte à {cell:c} de la cible après une attaque.",
+  "77217": "Mortadella Ninja",
+  "16444": "{#PORSHIDO}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Confère une +1\\_\u003cb\u003eAURA\u003c/b\u003e au \u003cb\u003eCochon\u003c/b\u003e allié ayant le moins de {%PV}.",
   "80943": "Niels Laren",
-  "88943": "{#MUSTNOTDIE}\n\\---\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Déclenche une \u003cb\u003eATTAQUE\u003c/b\u003e sur un allié jusqu\u0027à {value:(c+1)}\\_cases de lui.",
-  "94212": "Samouraï",
-  "44464": "{#PORSHIDO}\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Confère +{attackBoost:at} pour le tour aux cochons par aura qu\u0027ils possèdent.\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:\\_Confère +1 Aura\\và un cochon aléatoire.",
+  "88943": "{#MUSTNOTDIE}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Déclenche une \u003cb\u003eATTAQUE\u003c/b\u003e sur un allié jusqu\u0027à {value:(c+1)}\\_cases de lui.",
+  "94212": "Jamon le Shihan",
+  "44464": "{#PORSHIDO}\n\\---\n{#CRITICAL}\\_: {#BOUNCE}\n\\---\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:\\_+{value:ar} {%AR} aux autres \u003cb\u003eCochons\u003c/b\u003e ayant une {#aura}.",
   "13218": "Crasseux",
   "41023": "{#DIRTY}\nGagne +{armor:ar} quand un allié reçoit une aura.\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_:\\_Confère +1 Aura\\và un cochon aléatoire.",
-  "44174": "Mousse Ayon",
-  "82274": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: +{value:at}\\_{%AT} par personnage adverse qui n\u0027a pas d\u0027allié autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
-  "19054": "Ben Coupe Gorge",
-  "69977": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Dégâts doublés si la cible n\u0027a pas d\u0027allié autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle.",
-  "69807": "Bill l\u0027Arquebusier",
-  "71098": "{range}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Apllique {#BATTERED}.",
-  "10560": "La Requin",
-  "5195": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Téléporte la cible sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e. {#HUG[ÉTREINT]} la cible si elle est {#BATTERED[AMOCHÉE]}.",
-  "36973": "Musi\u0027Bwork",
-  "43993": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: -{value:at}\\_{%AT} et -1\\_{%PM} aux adversaires jusqu\u0027à 2 cases pour le tour.",
-  "96077": "Bwork Parle-Mer",
-  "64857": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Lance une {Spell:309} sur la cible si elle n\u0027a pas d\u0027allié autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle.",
-  "53040": "Capitaine Jako",
-  "21728": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de 2 cases les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e à la cible autre que lui.",
-  "10717": "Boule et Bwork",
-  "80622": "Charge et déclenche son \u003cb\u003eATTAQUE\u003c/b\u003e sur les personnages adverses alignés avec lui qui deviennent {#BATTERED[AMOCHÉS]}. 1 fois par tour.",
-  "65410": "Boomer",
-  "75473": "{#ANGRYDRIVE}\\_: Triple ses dégâts et subit des dégâts égal à son {%AT}.",
-  "93789": "Dompteur Ardent",
-  "10500": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche les entitées sur ses côtés.\n\u003cb\u003eMORT\u003c/b\u003e\\_: Déclenche {explosion:ex}.",
-  "15139": "Boom Boom",
-  "57058": "{range}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: la cible déclenche {explosion:ex}.",
-  "52849": "Bworkokète",
-  "46410": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Inflige {magicalDamage:dmg}\\v aux cases adjacentes\\_\u003csprite name\u003dcell_cross\u003e.\n{#ANGRYDRIVE}\\_: Soigne les alliés autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle de {heal:h}.",
-  "22542": "Bwork Beau Parleur",
-  "16236": "Tant qu\u0027il est en jeu les dégâts d\u0027explosion des alliés sont augmentés de {value:v}%.",
-  "46147": "Bwork Crache Feu",
-  "49178": "{#ANGRYDRIVE}\\_: les autres alliés déclenchent {explosion:ex}.\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Subit {magicalDamage:dmg}.",
-  "18764": "Magmabat",
-  "93960": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche aussi les personnages adjacents\\_\u003csprite name\u003dcell_cross\u003e à sa cible.\n{#ANGRYDRIVE}\\_: Les cibles touchées déclenchent {explosion:ex}.",
-  "52102": "Buveur de Lave",
-  "70166": "Pose une {FloorMechanism:278} sur sa case de départ quand il effectue un déplacement.",
+  "44174": "Larbin Pirate",
+  "82274": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Ajoute +{value:paR}\\_{%PA} à la {%reserve}.",
+  "19054": "Larbin Monté Pirate",
+  "69977": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Charge un adversaire aligné et lui retire {value:(-x)}\\_{%PA}\\_{%reserve}.",
+  "69807": "Traqueur Pirate",
+  "71098": "{range}\n\\---\n{#ANGRYDRIVE}\\_: Confère +{value:x}% aux dégâts physiques des Bworks autour \u003csprite name\u003dcell_around\u003e de lui pour le tour.",
+  "10560": "Bworkette Pirate",
+  "5195": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eAMOCHÉ\u003c/b\u003e\\_\u003csprite name\u003dgeneric_monster\u003e.\n\\---\n{#ANGRYDRIVE}\\_: Touche les {cell:c} devant elle.",
+  "36973": "Bworkokak Pirate",
+  "43993": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Inflige {physicalDamage:dm} aux adversaires autour\\_\u003csprite name\u003dcell_around\u003e de lui.\n\\---\n{#EXALTED}\\_: Confère +{armor:ar} aux Bworks alliés.",
+  "96077": "Bwork Parle-Lave Pirate",
+  "64857": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Lance une {Spell:589} sur ses cases adjacentes\\_\u003csprite name\u003dcell_cross\u003e.\n\\---\n{#EXALTED}\\_: Soigne de {heal:soin} les Bworks alliés.",
+  "53040": "Grô Bwork Pirate",
+  "21728": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche les {cell:c} devant lui.\n\\---\n{#EXALTED}\\_: Confère +{value:at}% aux dégâts physiques des Bworks alliés pour le tour.",
+  "10717": "Bworkakorn Pirate",
+  "80622": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: +{armor:x} aux autres alliés jusqu\u0027à {cell:c}\\_\u003csprite name\u003dcell_circle2\u003e.\n\\---\n{#EXALTED}\\_: Confère +{value:at}% aux dégâts physiques des Bworks alliés pour le tour.",
+  "65410": "Larbin Volcano\u0027culte",
+  "75473": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{value:dmgP}% de dégâts physiques aux Bworks alliés pour le tour s\u0027il est autour\\_\u003csprite name\u003dcell_around/\u003e d\u0027une {FloorMechanism:278}.",
+  "93789": "Larbin monté Volcano\u0027culte",
+  "10500": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: S\u0027il est autour \u003csprite name\u003dcell_around/\u003e d\u0027une {FloorMechanism:278}, traverse l\u0027adversaire ayant le plus de {%pv} en lui infligeant {physicalDamage:dmgM} physiques.",
+  "15139": "Traqueur Volcano\u0027culte",
+  "57058": "{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: La cible déclenche {explosion:ex} s\u0027il est autour\\_\u003csprite name\u003dcell_around\u003e d\u0027une {FloorMechanism:278}.",
+  "52849": "Bworkette Volcano\u0027culte",
+  "46410": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eAMOCHÉ\u003c/b\u003e\\_\u003csprite name\u003dgeneric_monster\u003e.\n\\---\nLance {value:c}\\_{Spell:589[SCORIES BRÛLANTES]} devant elle si elle est autour\\_\u003csprite name\u003dcell_around\u003e d\u0027une {FloorMechanism:278}.",
+  "22542": "Parle-Lave Volcano\u0027culte",
+  "16236": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Lance une {Spell:589} jusqu\u0027à {cell:c} de lui.\nSe soigne de {heal:h} s\u0027il est autour\\_\u003csprite name\u003dcell_around\u003e d\u0027une {FloorMechanism:278}.",
+  "46147": "Gro Bwork Volcano\u0027culte",
+  "49178": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Touche les {cell:c} devant lui.\n{#ROOTED[IMMOBILISE]} la cible s\u0027il est autour\\_\u003csprite name\u003dcell_around\u003e d\u0027une {FloorMechanism:278}.",
+  "18764": "Bworkokak Volcano\u0027culte",
+  "93960": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Gagne +{armor:ar} si la cible a l\u0027état \u003cb\u003eAMOCHÉ\u003c/b\u003e\\_\u003csprite name\u003dgeneric_monster\u003e.\nDéclenche {explosion:ex} s\u0027il est autour\\_\u003csprite name\u003dcell_around\u003e d\u0027une {FloorMechanism:278}.",
+  "52102": "Bworkakorn Volcano\u0027culte",
+  "70166": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Confère +{value:atAOE}% aux dégâts physiques aux Bworks alliés jusqu\u0027à {cell:c}\\_\u003csprite name\u003dcell_circle2\u003e pour le tour.\n\\---\nGagne aussi le bonus s\u0027il est autour\\_\u003csprite name\u003dcell_around\u003e d\u0027une {FloorMechanism:278}.",
   "2874": "Gurs le Bworzerker",
-  "99042": "{#ANGRYDRIVE} : {#ANGRYDRIVE[ENRAGE]} les alliés jusqu\u0027à 2 cases.\nDouble son {%at} et +{value:pm}\\_{%pm} quand il atteint {value:life}% de sa vie.",
+  "99042": "{#ANGRYDRIVE}\\_: Lance 1\\_{Spell:589} sur chaque case autour de lui.\n\\---\n{#EXALTED}\\_: Gagne {armor:ar}.",
   "94708": "Goff Le Leader",
-  "62553": "\u003cb\u003eMORT\u003c/b\u003e\\_: Un allié s\u0027{#ANGRYDRIVE[ENRAGE]} de manière permanente.\nQuand un allié s\u0027{#ANGRYDRIVE[ENRAGE]} il gagne +{value:at}\\_{%AT} et +{value:ar}\\_{%AR}.",
+  "62553": "{#ANGRYDRIVE}\\_: Déclenche {explosion:ex}.\n\\---\n{#EXALTED}\\_: Gagne {armor:ar}.",
   "73724": "Ugor L\u0027Amocheur",
   "90464": "Ajoute 1\\_{%PA} à la {%RESERVE} quand l\u0027état {#BATTERED} est appliqué.\nConfère {#SHIELD} à un allié quand l\u0027état {#BATTERED} est consommé.",
   "90208": "Rogan L\u0027Attachant",
-  "77789": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#HUG[ÉTREINT]} la cible si elle n\u0027a pas d\u0027allié autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle.\n+{value:at}\\_{%AT} aux alliés quand un personnage adverse meurt sans allié autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "77789": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#HUG[ÉTREINT]} la cible si elle n\u0027a pas d\u0027allié autour\\_\u003csprite name\u003dcell_around\u003e d\u0027elle.\n+{value:at}% de dégâts physiques aux alliés quand un personnage adverse meurt sans allié autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "54306": "Togor Le Détonant",
   "94063": "Quand un allié subit une \u003cb\u003eATTAQUE\u003c/b\u003e avec moins de {value:p}% de ses {%PV}, ils déclenchent {explosion:ex}.",
   "24077": "Narod Le Pataugeur",
-  "96294": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repouse la cible de {cell:c} et recule de {cell:c}.\nSoigne les alliés de {heal:h} quand une {FloorMechanism:278} est activée.",
+  "96294": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repouse la cible de {cell:c} et recule de {cell:c2}.\nSoigne les alliés de {heal:h} quand une {FloorMechanism:278} est activée.",
   "21202": "Tofu Enragé",
   "2241": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Se déplace de {cell:c} en ligne et inflige son {%at} aux adversaires traversés.",
   "7701": "Ninja",
-  "34630": "{#PORSHIDO}\n{#STRIKEATTACK}\nGagne +{attackBoost:at} par cible supplémentaire touchée\\vlors d\u0027une {#STRIKEATTACK}.",
+  "34630": "{#PORSHIDO}\n{#STRIKEATTACK}\nGagne +{value:at}% de dégâts physiques par cible supplémentaire touchée\\vlors d\u0027une {#STRIKEATTACK}.",
   "21883": "Collision",
   "15569": "{#DIRTY}\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:c}.\n{#COLLISION} : {magicalDamage:dmgC}.\nConfère +100% aux dégâts de {#COLLISION}\\vtant qu\u0027il est en jeu. [NEED DEV]",
   "56905": "Boufquette",
@@ -744,26 +560,26 @@
   "16691": "{#PORSHIDO}\nConfère +{armor:ar} et {#SHIELD} à un {#DOUBLE}\\vquand il arrive en jeu.\n{#DEATHBLOW}\\_:\\_Gagne +{armor:ar}, {#SHIELD} et créer un {#DOUBLE}.",
   "91743": "Maître de l\u0027Illusion",
   "30707": "{#PORSHIDO}\n{#DOUBLE}\nConfère +{armor:ar} et {#SHIELD} à un {#DOUBLE}\\vquand il arrive en jeu.\n{#DEATHBLOW}\\_:\\_Gagne +{armor:ar}, {#SHIELD} et créer un {#DOUBLE}.",
-  "47931": "Brise-Crâne",
-  "8369": "{#DIRTY}\n\\---\nQuand une cible devient {#FRACTURED[Fracturée]}, se téléporte proche d\u0027elle et déclenche une \u003cb\u003eATTAQUE\u003c/b\u003e.",
+  "47931": "Jamon le Sanguinaire",
+  "8369": "{#DIRTY}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e: +{value:pm} {%PM} aux autres \u003cb\u003eCochons\u003c/b\u003e ayant une {#aura}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e: Téléporte l\u0027adversaire sur une case adjacente \u003csprite name\u003dcell_cross\u003e à un cochon aléatoire.",
   "59184": "Craqueboule",
   "15855": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: -1\\_{%pm} à la cible pour le tour\\v s\u0027il possède de l\u0027{%ar}.",
   "50437": "croqueur",
   "90193": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique {#STUN}\\vs\u0027il possède de l\u0027{%ar}.",
   "90959": "Craquasseur",
-  "99984": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{attackBoost:at}\\vs\u0027il possède de l\u0027{%ar}.",
+  "99984": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{value:at}% de dégâts physiques s\u0027il possède de l\u0027{%ar}.",
   "95529": "Fracasseur",
-  "4378": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Gagne +{attackBoost:v} jusqu\u0027à sa prochaine \u003cb\u003eATTAQUE\u003c/b\u003e si aucun adversaire n\u0027est autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "4378": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Gagne +{value:v}% de dégâts physiques jusqu\u0027à sa prochaine \u003cb\u003eATTAQUE\u003c/b\u003e si aucun adversaire n\u0027est autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "3161": "Craquelourd",
   "2716": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{armor:v}\\v si aucun adversaire n\u0027est autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
   "90266": "Craqueleur Ancestral",
   "30927": "Attire tous les adversaires d\u00271 case\\vquand il se déplace.",
   "22319": "Craqueleur Erodé",
-  "30669": "{range}\n\u003cb\u003eDÉBUT DE TOUR\u003c/b\u003e\\_: Construit un {ObjectMechanism:1607} derrière\\vles adversaires alignés avec lui.",
+  "30669": "{range}\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Construit un {ObjectMechanism:1607} derrière\\vles adversaires alignés avec lui.",
   "13566": "Impératrice Galantine en Deuil",
   "18884": "{#PORSHIDO}\n\\---\nAugmente les chances de {#CRITICAL[CRITIQUES MAGIQUES]} de +75% et réduit le coût des sorts de -1\\_{%pa}.\n\\---\n{#CRITICAL[COUP CRITIQUE MAGIQUE]}\\_:\\_Ajoute {addReserve:pa}.",
   "35365": "Empereur Guemene en Deuil",
-  "54202": "{#PORSHIDO}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{attackBoost:atk} pour le tour par AURA qu\u0027il possède.\n\\---\n{#CRITICAL}\\_: Inflige +50% de dégâts.",
+  "54202": "{#PORSHIDO}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Gagne +{value:atk}% aux dégâts physiques pour le tour par AURA qu\u0027il possède.\n\\---\n{#CRITICAL}\\_: Inflige +50% de dégâts.",
   "44403": "Conjurateurs Chuchoteurs",
   "45981": "{#Unmovable[Inamovibles]}\n\\---\n\u003ci\u003e\u003cb\u003e*Incantent*\u003c/b\u003e\u003c/i\u003e",
   "57288": "Striky",
@@ -773,13 +589,11 @@
   "23293": "Brooklin",
   "51248": "{#CRAQBOWLEUR} : Gagne +X {%AR} et {#SHIELD}",
   "75938": "Split",
-  "40778": "{#CRAQBOWLEUR}\\v\u003cb\u003eATTAQUE\u003cb\u003e\\_:\\_Repousse de {value:c} cases.\\v{#stun[assomme]} la cible si elle rentre en {#COLLISION}.",
+  "40778": "{#CRAQBOWLEUR}\\v\u003cb\u003eATTAQUE\u003cb\u003e\\_:\\_{#PUSH} de {value:c} cases.\\v{#stun[assomme]} la cible si elle rentre en {#COLLISION}.",
   "34184": "L\u0027enrouleur",
-  "74958": "{#CRAQBOWLEUR}\\v+1 {%PM} et +{attackBoost:AT} tant qu\u0027il a de l\u0027{%AR}.",
+  "74958": "{#CRAQBOWLEUR}\\v+1 {%PM} et +{value:AT}% de dégâts physiques tant qu\u0027il a de l\u0027{%AR}.",
   "16423": "King Pin",
   "3480": "{#CRAQBOWLEUR}\\v\u003cb\u003eATTAQUE\u003cb\u003e\\_:\\_Téléporte la cible de 4 cases.",
-  "56681": "Forteresse Royale",
-  "57530": "{#UNMOVABLE}\n-\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Reconstruit son {%ar}\\vet gagne {#SHIELD}.\n-\nGagne +{attackBoost:RoyalFortressAT} quand il subit des dégâts.",
   "95135": "croquis",
   "9511": "\u003cb\u003eFIN DU TOUR\u003cb\u003e\\_:\\_Se {#petrify[pétrifie]} s\u0027il est\\vautour\\_\u003csprite name\u003dcell_around\u003e d\u0027un {ObjectMechanism:1607}.",
   "34239": "craquenoud",
@@ -789,11 +603,11 @@
   "74621": "Crac Ancien",
   "68488": "\u003cb\u003eDÉBUT DU TOUR\u003cb\u003e\\_:\\_ Inflige {value:v} dégâts\\vaux adversaires alignés à lui.",
   "99264": "Craquemousse",
-  "76046": "\u003cb\u003eDÉBUT DE TOUR\u003cb\u003e\\_:\\_Les {ObjectMechanism:1607} infligent {value:v} dégâts\\vaux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à eux.",
+  "76046": "\u003cb\u003eDÉBUT DU TOUR\u003cb\u003e\\_:\\_Les {ObjectMechanism:1607} infligent {value:v} dégâts\\vaux adversaires adjacents\\_\u003csprite name\u003dcell_cross\u003e à eux.",
   "96514": "Craconneur",
   "61504": "\u003cb\u003eATTAQUE\u003cb\u003e\\_:\\_ inflige sur les 3 cases devant lui son\\v{%AT} + {value:v} dégats par cases de distance.\\v\nn\u0027inflige pas dégâts aux alliés.",
   "76089": "Pichon",
-  "64004": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique {#BLOODY} ou\\vGagne +{attackBoost:at} si la cible est {#BLOODY[Ensanglantée]} \u003csprite name\u003dgeneric_monster\u003e.",
+  "64004": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_Applique {#BLOODY} ou\\vGagne +{value:at}% de dégâts physiques si la cible est {#BLOODY[Ensanglantée]} \u003csprite name\u003dgeneric_monster\u003e.",
   "87812": "Chapeau Méduse",
   "30372": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Attire d\u00271 à 2 cases les personnages jusqu\u0027à 3 cases de distance.",
   "15805": "Pichon Sorcier",
@@ -805,14 +619,14 @@
   "24620": "Raie Noire",
   "37601": "{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_:\\_{#BOUNCE} qui blesse les adversaires\\vet soigne les alliés.",
   "23294": "Requin",
-  "87789": "Gagne +{attackBoost:at} quand\\v{#BLOODY} est appliqué.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Gagne +1 {%pm} pour le tour\\vsi un adversaire est {#BLOODY}.",
+  "87789": "Gagne +{value:at}% de dégâts physiques quand\\v{#BLOODY} est appliqué.\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_:\\_Gagne +1 {%pm} pour le tour\\vsi un adversaire est {#BLOODY}.",
   "19093": "Élémentaire d\u0027Eau",
   "64749": "Inflige {magicalDamage:dmg} par case parcourue à un adversaire dès qu\u0027il est déplacé\\vpar un sort ou une capacité.",
   "95929": "Boss 3",
   "77552": "",
-  "74616": "Summonings",
+  "74616": "05",
   "50487": "",
-  "20049": "Summonings",
+  "20049": "13",
   "41829": "",
   "58082": "Terminataure",
   "53947": "Charge les adversaires qui terminent leur déplacement aligné avec lui et leur inflige son {%AT}.",
@@ -821,19 +635,19 @@
   "34244": "La Montagne",
   "24928": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Se téléporte sur un {ObjectMechanism:1607} dans la zone\\_\u003csprite name\u003dcell_circle2\u003e d\u0027un adversaire.\n-\n\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Détruit les {ObjectMechanism:1607[ROCHERS]} puis en construit {value:rocks}\\_autres sur le terrain.",
   "60241": "Forteresse Royale",
-  "8487": "{#UNMOVABLE}\n\\---\nQuand elle atteint {armor:ar1} ou {armor:ar2}, elle devient {#STUN[ASSOMMÉE]} et gagne +{attackBoost:at}.",
+  "8487": "{#UNMOVABLE}\n\\---\nQuand elle atteint {armor:ar1} ou {armor:ar2}, elle devient {#STUN[ASSOMMÉE]} et gagne +{value:at}% de dégâts physiques.",
   "73945": "Âme Corrompue",
-  "31135": "-1\\_{%pa} au coût de vos sorts.\n\\---\n{#DEATHBLOW!}\\_: Ajoute le sort {Spell:65351} à votre main.",
+  "31135": "{#UNIQUE}\n\\---\n\u003cb\u003eMORT\u003c/b\u003e: Une {#SHADOW} inflige {valueAndNext:Skill.258.operc} dégâts magiques  l\u0027adversaire avec le plus de {%PV}.",
   "58240": "Mausolâme",
   "18939": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Si possible, se déplace de {cell:c} en ligne. Inflige {value:perc}% de l\u0027{%AT} de votre héros sur chaque adversaire traversé.",
   "79048": "Âme Céleste",
-  "10915": "-1\\_{%pa} au coût de vos sorts.\n\\---\n{#PHASE}\n\\---\nUn {#LIGHTNING} inflige {valueAndNext:Skill.488.perc}% de l\u0027{%AT} de votre héros aux adversaires qu\u0027elle traverse.\n\\---\nNe peut pas attaquer.",
+  "10915": "{#UNIQUE}\n\\---\n\u003cb\u003eMORT\u003c/b\u003e: Un {#LIGHTNING} inflige {valueAndNext:Skill.488.perc} dégâts physiques à l\u0027adversaire ayant le plus de {%PV}.",
   "66085": "Âme Vide",
-  "75274": "-1\\_{%pa} au coût de vos sorts.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Ajoute le sort {Spell:38} à votre main.",
+  "75274": "{#UNIQUE}\n\\---\n\u003cb\u003eMORT\u003c/b\u003e: Une {#WAVE} inflige {valueAndNext:Skill.251.perc} dégâts magiques à l\u0027adversaire avec le plus de {%PV}.",
   "75538": "Âme Volcanique",
-  "49584": "-1\\_{%pa} au coût de vos sorts.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Un {#METEOR} inflige {valueAndNext:Skill.488.perc} de l\u0027{%AT} de votre héros.",
+  "49584": "{#UNIQUE}\n\\---\n\u003cb\u003eMORT\u003c/b\u003e: Un {#METEOR} inflige {valueAndNext:Skill.568.perc} dégâts physiques sur sa case.",
   "99208": "Dragonnet Chromatique",
-  "35901": "{#UNIQUE}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e : -1\\_{%pa} au coût des sorts {Spell:65910!} alliés ou piochez un sort \u003cb\u003eDraconique\u003c/b\u003e autre que {Spell:657!}.",
+  "35901": "{#UNIQUE}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e : +{value:valueWakfu} niveau de {#WAKFU}.",
   "80482": "Esprit de Feu",
   "44589": "{#UNIQUE}\n\\---\nVos sorts déclenchent {explosion:ex}.",
   "88140": "Esprit de l\u0027Air",
@@ -843,39 +657,147 @@
   "67193": "Esprit de l\u0027Eau",
   "52984": "{#UNIQUE}\n\\---\nAjoute {addReserve:pa} quand vous jouez un sort.",
   "66432": "Oeil Nécromique",
-  "38770": "{#UNIQUE}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Soigne les autres \u003cb\u003eNécromes\u003c/b\u003e de son {%at} et inflige son {%at} aux adversaires.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eInvocation Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
+  "38770": "{#UNIQUE}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Soigne les \u003cb\u003eNécromes\u003c/b\u003e alliés de son {%at} et inflige son {%at} aux adversaires.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eInvocation Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "33493": "Rat Goût",
   "29846": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMORDU\u003c/b\u003e.",
   "50327": "Rat Gnarok",
-  "52537": "Gagne +{attackBoost:AT} quand l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e\\vest appliqué.",
+  "52537": "Gagne +{value:AT}% de dégâts physiques quand l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e est appliqué.",
   "88076": "Rat Diation(not used)",
   "35990": "\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e\\_: Applique l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e ou {#INFECTED} si la cible a l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e aux adversaires\\vautour de lui.",
   "94256": "Rat Justé",
-  "36257": "Gagne +{attackBoost:AT}\\vquand un allié subit des dégâts.",
-  "63316": "Rat Cunier",
-  "49764": "",
+  "36257": "Gagne +{value:AT}% de dégâts physiques\\vquand un allié subit des dégâts.",
   "45628": "Rat Cunier",
   "16677": "Déclenche son attaque sur un adversaire adjacent quand un allié subit des dégâts.",
   "79739": "Rat Diation",
   "7247": "Quand un allié meurt applique l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e ou {#INFECTED} si la cible a l\u0027état \u003cb\u003eMORDU\u003c/b\u003e \u003csprite name\u003dgeneric_monster\u003e aux adversaires\\vautour de lui.",
   "36069": "Kanard",
-  "77167": "{#UNIQUE}\n\\---\n\u003cb\u003eFIN\\_DU\\_TOUR\u003c/b\u003e\\_: Se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e aux adversaires dans les coins en déclenchant une attaque.",
+  "77167": "{#UNIQUE}\n\\---\n\u003cb\u003eFIN\\_DU\\_TOUR\u003c/b\u003e\\_: Se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e aux adversaires dans les coins et déclenche son attaque.",
   "16006": "Bouftonciel",
-  "39326": "{#MUSTNOTDIE}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e:\nRepousse de {cell:r}.",
+  "39326": "{#MUSTNOTDIE}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e:\n{#PUSH} de {cell:r}.",
   "10664": "Tof\u0027Argent",
   "71007": "{#MUSTNOTDIE}\n\\---\n\u003cb\u003eFIN DU TOUR ADVERSE \u003c/b\u003e: Prend son {#AIRBORNE[ENVOL]}.",
   "35323": "Serviteur Nécromique",
   "32699": "{#UNIQUE}\n\\---\n\u003cb\u003eMORT\u003c/b\u003e\\_: Piochez le sort {Spell:578}.\n\\---\n\u003calign\u003dright\u003e\u003ci\u003e\u003ccolor\u003d#A0A0A0\u003e\u003csize\u003d80%\u003eInvocation Nécrome\u003c/color\u003e\u003c/i\u003e\u003c/align\u003e",
   "2486": "Ninjadine",
-  "2": "",
-  "3": "",
-  "4": "",
-  "6": "",
-  "7": "",
-  "9": "",
-  "10": "",
-  "11": "",
-  "12": "",
-  "5": "",
-  "13": ""
-}
+  "65477": "{#PORSHIDO}\n\\---\n\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente à l\u0027adversaire ayant le moins d\u0027{%at}.\n\\---\nSe téléporte à 5 cases de la cible\\vaprès une attaque.",
+  "74325": "Krabapic",
+  "2543": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Confère + {armor:ar} aux alliés qui se trouvent autour\\_\u003csprite name\u003dcell_around\u003e.",
+  "97406": "Krabken",
+  "64390": "{#RIPOSTE}\\_({value:rip}).",
+  "74350": "Bogdapoulpe",
+  "63941": "\\---\n{range}\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Recule de 2 cases s\u0027il est aligné avec la cible.",
+  "15930": "Poulpanov",
+  "43768": "\\---\n{range}\n\\---\nAPPARITION\\_: Gagne {value:v}\\_{#INKEDSIGHT[CARTOUCHES ENCRÉES]}.",
+  "57536": "Proctoss Surin",
+  "83505": "\u003cb\u003eMORT\u003c/b\u003e\\_: Pose un {FloorMechanism:1089} sur sa case.",
+  "84813": "Muscapol",
+  "82260": "{#UNIQUE}\n\\---\n\u003cb\u003eFIN\\_DU\\_TOUR\u003c/b\u003e\\_: Se téléporte sur une case adjacent\\_ \u003csprite name\u003dcell_cross\u003e à l\u0027adversaire ayant la plus haute {%AT} et déclenche une attaque.",
+  "11051": "Ploutrozorus",
+  "492": "\u003cb\u003e FIN DU TOUR\u003c/b\u003e : Se téléporte sur une case adjacente\\_\u003csprite name\u003dcell_cross\u003e à un adversaire indemne aléatoire et l\u0027attaque.​\n\\---\n(Attaque un blessé si plus d’indemne)",
+  "84794": "Comte Doutro Tombo",
+  "33835": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Invoque un {Summoning:701} sur une case adjacente\u003csprite name\u003dcell_cross/\u003e à une {ObjectMechanism:249}.\n\\---\n\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse la cible d\u0027{value:min} à {cell:max}.",
+  "94959": "Fran\u0027Eau",
+  "77592": "{#UNIQUE}\n\\---\n\u003cb\u003eDÉBUT\\_DU\\_TOUR\u003c/b\u003e\\_: Traverse les adversaires d\u0027une ligne en leur infligeant son {%AT}.",
+  "69024": "Gall Le Lion",
+  "72684": "",
+  "21662": "{#EXALTED}\\_: Gagne {#SHIELD}.\n\\---\n{#ANGRYDRIVE}\\_: Déclenche {explosion:ex}.",
+  "23122": "Oscargne",
+  "37308": "Krouktos",
+  "90277": "Castresse la Frigide",
+  "78042": "Bolos-Le-Niais",
+  "51264": "Aligore Le Fragile",
+  "28593": "Mossaka",
+  "86608": "Gnokoss",
+  "59394": "Kiro",
+  "60530": "Lester",
+  "38768": "Barbos Le Désosseur",
+  "15619": "Hocho La Dépeceuse",
+  "60032": "San Toku",
+  "68627": "Hochos Bochos",
+  "95062": "L\u0027Évideur",
+  "68567": "Mikoss",
+  "22990": "Kubaki",
+  "90454": "Pasidaam le Parle-Mer",
+  "65418": "Timonier Zahark",
+  "41134": "Maîtresse Coque Throude",
+  "8475": "Second Tarner",
+  "26481": "Capitaine Jako",
+  "78417": "Ben Coupe Gorge",
+  "49689": "Ayon le jeune mousse",
+  "30229": "Flibustier Bill",
+  "87569": "Hérault Volkamax",
+  "24981": "Flamme-Matriarche Gherta",
+  "64150": "Pikalav le Surpuissant",
+  "2807": "Magmabat le violent",
+  "91399": "Daar le Rapide",
+  "63711": "Klum le Petit",
+  "31279": "Ghrom le Fulminant",
+  "73306": "Orchk le Tireur",
+  "67835": "Gralex Lelarge",
+  "65474": "Freddy Grouiger",
+  "68373": "Carnibal Lecter",
+  "2627": "Grack Torrance",
+  "20730": "Forman Bates",
+  "41002": "Grannie Wilkes",
+  "80174": "Pigsaw",
+  "90043": "Mai Shiragrouik",
+  "80769": "Shrouidder",
+  "77981": "Double de Mai Shiragrouik",
+  "6752": "Double d\u0027Orochimagrouik",
+  "11125": "Grouik Smoke",
+  "48096": "Orochimagrouik",
+  "14173": "Grouyu Hayabusa",
+  "89613": "Maki Gengrouisai",
+  "97669": "Yoshigrouitsu",
+  "46201": "Carloss",
+  "47436": "Perséphoss",
+  "55732": "Grégore",
+  "59000": "La Rafale",
+  "69661": "Cubitoss",
+  "7394": "",
+  "18822": "Boit-Sans-Soif",
+  "53016": "",
+  "62481": "Mushail",
+  "61040": "Henriette",
+  "65940": "Shorizo le Piquant",
+  "98057": "Frank le Fort",
+  "6695": "Nick Lardson",
+  "20647": "",
+  "93729": "",
+  "52920": "Mushail",
+  "27585": "Henriette",
+  "25654": "Pépé Rony",
+  "26576": "Knack",
+  "96892": "",
+  "33079": "",
+  "28322": "Don Faurtesk",
+  "46601": "Zakass",
+  "25634": "Chasseur Thonk",
+  "81901": "Cavalier Patapak",
+  "67040": "Jeune Grar",
+  "42644": "Cogneur Bonk",
+  "10040": "Guerrier Vlame",
+  "76765": "Femme Badam",
+  "35968": "Porte-cor Foump",
+  "49150": "Chaman Parlofeu",
+  "86714": "\u003cb\u003eDÉBUT DU TOUR\u003c/b\u003e\\_: Lance une {Spell:589} jusqu\u0027à 2 cases de lui.\n\\---\n{#ANGRYDRIVE}\\_: Déclenche {explosion:ex}.",
+  "31104": "-1",
+  "4677": "-1",
+  "85992": "-1",
+  "78322": "-1",
+  "7401": "-1",
+  "77317": "-1",
+  "64024": "-1",
+  "36339": "-1",
+  "21331": "-1",
+  "58233": "-1",
+  "28521": "-1",
+  "5089": "-1",
+  "34204": "-1",
+  "282606": "-1",
+  "40232": "-1",
+  "87632": "-1",
+  "86094": "-1",
+  "1898": "-1",
+  "null": ""
+}
\ No newline at end of file
diff --git a/data/json/dico/UI.json b/data/json/dico/UI.json
index e620679665cfa89447449e8d0cc2f4e855f09e41..7a3d23eaba60750006f81bd3c312df4086cffc11 100644
--- a/data/json/dico/UI.json
+++ b/data/json/dico/UI.json
@@ -1,5 +1,5 @@
 {
-  "229": "UI",
+  "1036": "UI",
   "36454": "Passif de l\u0027arme",
   "81202": "Decks associés",
   "33557": "Sort : {0}",
@@ -14,7 +14,7 @@
   "11473": "Inventaire",
   "39313": "Choisissez votre arme et gérez vos decks.",
   "84166": "Ce Deck n\u0027est pas éditable.",
-  "45437": "Confirmation pour passer un tour.",
+  "45437": "Confirmation pour passer un tour",
   "54521": "Cachées",
   "34055": "Affichées",
   "31728": "Je suis pas venu ici pour souffrir, ok ?",
@@ -36,7 +36,7 @@
   "2733": "Abandonner",
   "86808": "Quitter le jeu",
   "66313": "Emote",
-  "75053": "Activer les emotes.",
+  "75053": "Activer les emotes",
   "74068": "Portrait",
   "3666": "Personnage",
   "81489": "{0} n\u0027est pas connecté(e)",
@@ -55,7 +55,7 @@
   "29514": "Auto fermeture après l\u0027envoi ( mode optimisé )",
   "38369": "Le canal de discussion est activé.",
   "38631": "Le canal de discussion est fermé.",
-  "47373": "Prevenir quand un ami entre en jeu",
+  "47373": "Prévenir quand un ami entre en jeu",
   "63667": "PVP 1V1",
   "67716": "PVP 2V2",
   "34785": "retour havre-île",
@@ -105,7 +105,6 @@
   "15128": "air",
   "71144": "terre",
   "43151": "neutre",
-  "15321": "réserve",
   "37974": "multi-éléments",
   "17799": "Anneaux",
   "60062": "broche",
@@ -120,7 +119,7 @@
   "84787": "Aucun résultat",
   "95456": "Aucun équipement disponible",
   "77078": "Niv. Max",
-  "99521": "Fermeture des onglets de chat.",
+  "99521": "Fermeture des onglets du chat",
   "39271": "Vous n\u0027êtes plus dans la bonne zone pour utiliser ce canal.",
   "47890": "Le groupe a été dissous\nle canal est fermé.",
   "16300": "Le combat est terminé.\nle canal est fermé.",
@@ -149,10 +148,9 @@
   "40043": "+ {0} succès cachés.",
   "70585": "Voulez-vous changer les articles du marchant ?",
   "36079": "Bouftous bouffés",
-  "91495": "Antre",
   "44179": "Bouftous mutants",
   "287": "Baston Générale",
-  "66286": "Durée des bulles de textes.",
+  "66286": "Durée des bulles de textes",
   "87117": "Longue",
   "53521": "Courte",
   "97402": "Moyenne",
@@ -170,25 +168,19 @@
   "95942": "Cette touche n est pas valide pour une assignation.",
   "58432": "\u003caucune\u003e",
   "93568": "Passer son tour",
-  "37547": "Utiliser la reserve",
+  "37547": "Utiliser la réserve",
   "63283": "Bulle de texte en combat",
   "373": "Toutes",
   "4754": "PNJ seulement",
   "8388": "Joueurs seulement",
   "26494": "Aucune",
-  "74657": "Aperçu plumé (Q0)",
-  "32891": "Combat",
-  "13078": "ouvrir la selection d\u0027arme",
-  "47946": "ouvrir la selection de classe.",
   "64730": "Social",
-  "26508": "Liste d\u0027ami",
+  "26508": "Liste d\u0027amis",
   "2161": "Vol au-dessus pour faire coucou (Q1)",
   "52180": "Pierres qui roulent...",
-  "74123": "Aperçu craqué",
   "74824": "Historique",
   "12209": "arbre de talents modifié",
   "19850": "Voulez vous sauvegarder les modifications",
-  "46670": "",
   "60945": "Une goutte de sang dans la mer...",
   "36694": "MAX",
   "98952": "Bagarre Familial",
@@ -199,15 +191,15 @@
   "24175": "Points de Vie",
   "26969": "Résist. Physique",
   "24051": "Résist. Magique",
-  "87097": "Dégâts d\u0027Arme",
-  "40544": "Dégâts des Sorts",
-  "61893": "Dégâts CC des Sorts",
+  "87097": "Dégâts Physiques",
+  "40544": "Dégâts Magiques",
+  "61893": "Dégâts CC Magiques",
   "59844": "{0,plural, zero[Point Disponible] one[Point Disponible] other[Points Disponibles]}",
   "39347": "[Clique droit] sur l\u0027icone d\u0027un compagnon pour éditer ses compétences.",
   "61146": "[Clique droit] sur l\u0027icone d\u0027un équipement pour l\u0027éditer.",
   "84142": "Coût: {0}",
   "39610": "Equipable",
-  "58225": "reinitialiser",
+  "58225": "réinitialiser",
   "8290": "Reinitialisation",
   "48580": "Voulez-vous récuperer les points dépensés?",
   "50723": "Inventaire",
@@ -228,5 +220,37 @@
   "38776": "Arrêter le test",
   "27375": "Ouvrir la sélection d\u0027arme.",
   "23872": "Ouvrir la sélection de classe.",
-  "12953": "Ouvrir l\u0027édition de deck."
+  "12953": "Ouvrir l\u0027édition de deck",
+  "12130": "Gains Possibles",
+  "68972": "Heros",
+  "18391": "Changer de hero",
+  "4651": "Tuto",
+  "61831": "Choisissez une caractéristique",
+  "37479": "L\u0027Armée des Morts",
+  "57393": "Choisissez un sort",
+  "40658": "Echec de la création",
+  "10101": "La création du hero à échoué",
+  "59615": "Supprimer ce héros ?",
+  "30846": "Ce héros sera definitivement supprimé.",
+  "59881": "Passer le tuto",
+  "95575": "Créer un nouveau héros",
+  "35599": "jouer ce hero",
+  "93004": "Ajouter aux Favoris",
+  "15716": "Supprimer des favoris",
+  "88292": "Sorts communs",
+  "36311": "Sorts d\u0027arme",
+  "13941": "+ {0} {0,plural, zero[point] one[point] other[points]} de competence.",
+  "74314": "Buffet à volonté",
+  "37253": "Vague de chaleur",
+  "83631": "Passer l\u0027intro",
+  "5582": "Vague {0}",
+  "60066": "Combat",
+  "15321": "Réserve",
+  "96095": "PA",
+  "7137": "La \u003cb\u003eRÉSISTANCE\u003c/b\u003e réduit les dégâts subis de 50%.\nSa probabilité de déclenchement est calculée en fonction de sa valeur et des dégâts adverses.",
+  "36427": "La \u003cb\u003eRÉSISTANCE\u003c/b\u003e réduit les dégâts subis de 50%.\nSa probabilité de déclenchement est calculée en fonction de sa valeur et des dégâts adverses.",
+  "68593": "Pourcentage de chance d\u0027effectuer un \u003cb\u003eCoup Critique\u003c/b\u003e.",
+  "87370": "Pourcentage de bonus supplémentaire aux dégâts de base lors d\u0027un \u003cb\u003eCoup Critique\u003c/b\u003e.",
+  "27597": "Pourcentage de chance d\u0027effectuer un \u003cb\u003eCoup Critique\u003c/b\u003e.",
+  "56687": "Pourcentage de bonus supplémentaire aux dégâts de base lors d\u0027un \u003cb\u003eCoup Critique\u003c/b\u003e."
 }
diff --git a/data/json/dico/Weapons.json b/data/json/dico/Weapons.json
index c30273ce258177ccdd864bd21bf6a10a64250cac..cb099a4e36f10cbb2073f9b7f65e90a2d5ddf5a6 100644
--- a/data/json/dico/Weapons.json
+++ b/data/json/dico/Weapons.json
@@ -1,51 +1,32 @@
 {
-  "113": "Weapons",
-  "81217": "",
-  "5807": "",
-  "82163": "",
+  "1036": "Weapons",
   "22906": "Justelame Brutale",
   "26619": "Synchronisateur Tako",
   "17185": "Régulant Gurpapa",
   "20731": "Pinceau Kokoro",
   "4381": "Sabliaton Jikan",
   "91645": "Lamarguedon Spectral",
-  "26733": "L\u0027Aiguille de Xélor",
-  "30483": "{#STARTTURN}\\_: Vos mécanismes gagnent +{blindage:bl}.",
   "53924": "Gagne {value:ah}\\_{#AVENGERHOURGLASS} quand {heroGender: m[il] f[elle]} gagne de\\_l\u0027{%ar}.",
-  "12127": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Ajoute jusqu\u0027à 3 de vos {%PA} restants à votre {%reserve}.",
+  "12127": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Ajoute jusqu\u0027à {value:pa} de vos {%PA} restants à votre {%reserve}.",
   "19797": "Ajoute +1\\_{%pA} à votre réserve quand vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e.",
   "11633": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Piochez votre prochain \u003cb\u003eSINISTRO\u003c/b\u003e.",
   "83785": "Catalysateur Pramium",
-  "13018": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\\_\u003c/b\u003e: Gagne {attackBoost:at} pour le tour par adversaire autour\\_\u003csprite name\u003dcell_around\u003e de lui.",
+  "13018": "\u003cb\u003eDÉBUT\\_DU\\_TOUR\\_\u003c/b\u003e: Gagne 4\\_{%at} pour le tour par adversaire autour\\_\u003csprite name\u003dcell_around\u003e {heroGender: m[de lui] f[d\u0027elle]}.",
   "52152": "Bouvaloir Orok",
   "47468": "Inflige son {%at} à la cible quand {heroGender: m[il] f[elle]} \u003cb\u003echarge\u003c/b\u003e.",
   "62897": "Glaive Stalaktoss",
-  "34380": "Gagne {attackBoost:at} tant qu\u0027il possède {#SHIELD}.",
-  "53273": "Ombre Glacée",
-  "82144": "Ne peut pas être affecté par un \u003cb\u003eétat élémentaire\u003c/b\u003e.",
+  "34380": "Gagne 15\\_{%at} tant qu\u0027{heroGender: m[il] f[elle]} possède {#SHIELD}.",
   "82807": "Gagne {#PHASE} et 1\\_{%pm} pour le tour par {%pa} obtenu quand vous videz votre {%reserve}.",
-  "39254": "Réduit de 1\\_\u003cb\u003ePA\u003c/b\u003e le coût de vos sorts \u003cb\u003eAir\u003c/b\u003e\u003csprite name\u003dair\u003e.\nNe peut pas attaquer.",
-  "42108": "Ame Spectrale",
   "97299": "Flamboyante Kasaï",
-  "45846": "\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e\\_: Rejoue son tour (limité à une fois par tour).",
+  "45846": "\u003cb\u003eCOUP DE GRÂCE\u003c/b\u003e\\_: Rejoue son tour.\n(1 fois par tour)",
   "14268": "Inflige son {%AT} à l\u0027adversaire ayant le plus de {%pv} quand {heroGender: m[il] f[elle]} se téléporte.",
   "46543": "Aiguille Pikuxala",
-  "58093": "Le Ténébreux Spectral",
-  "59770": "Chaque fois qu\u0027un de vos Compagnons meurt, vous invoquez une {Summoning:898}.",
-  "71862": "L\u0027Aiguille de Xélor",
-  "8410": "{addReserve:v} lorsque vous construisez un \u003cb\u003eSINISTRO\u003c/b\u003e.",
-  "89253": "Le Synchronisateur",
-  "7128": "Votre Héros vous dispose d\u0027 1\\_\u003cb\u003ePA\u003c/b\u003e\u003csprite name\u003dAP\u003e supplémentaire.",
-  "3599": "Le Champion Flamboyant",
-  "63045": "Votre Héros gagne 1\\_\u003cb\u003ePM\u003c/b\u003e pour le tour chaque fois que vous jouez un sort FEU\u003csprite name\u003dfire\u003e.",
-  "56292": "Weapons",
-  "24246": "Weapons",
   "57149": "{#DEATHBLOW} : Piochez votre sort d\u0027{#CALL[APPEL]} et gagne {value:nb} {#EVOLUTIONSTONE}.",
   "90472": "Bâton de Berger",
   "32685": "Bâton Tofu",
   "32030": "\u003cb\u003eATTAQUE\u003c/b\u003e : Piochez votre sort d\u0027{#CALL[APPEL]}.",
   "28838": "Surin Sourokan",
-  "64614": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Repousse de {cell:c}.",
+  "64614": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: {#PUSH} de {cell:c}.",
   "29469": "Cisaille Orishi",
   "74247": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Les {#TRAP[PIÈGES]} alliés déclenchent {explosion:ex}.",
   "66555": "Lame Ouraï",
@@ -60,18 +41,16 @@
   "61422": "{addReserve:pa} quand un adversaire est {#STUN}.",
   "25275": "Bâton Prespic",
   "21127": "Votre héros gagne {value:nb}\\_{#EVOLUTIONSTONE}\\v quand il subit une attaque.\nLimitée à 1 par tour.",
-  "41182": "IOP - Test éèàâêëïôîÂÉ",
-  "79307": "IOP - Test éèàâêëïôîÂÉ",
   "50742": "Shiru Shaden",
-  "32584": "Réduit de 1\\_{%pa} le coût du prochain sort joué ce tour quand vous jouez un sort sur un adversaire à plus de {cell:c} de votre héros.",
+  "32584": "Réduit de 1\\_{%pa} le coût du prochain sort quand vous jouez un sort sur un adversaire à {cell:c} ou moins {heroGender: m[de lui] f[d\u0027elle]}.",
   "39073": "Voldorak Vo",
-  "52320": "Confère +{value:pm}\\_{%pm} à votre héros pour le tour quand vous jouez un sort sur un adversaire à plus de {cell:c} de votre héros.",
+  "52320": "Gagne 8\\_{%at} jusqu’à sa prochaine attaque quand vous jouez un sort sur une cible alignée à {heroGender: m[lui] f[elle]}.",
   "45608": "Arc Piven",
-  "2126": "Vole 1\\_{%pa} à la réserve de la cible quand vous jouez un sort sur un adversaire à plus de {cell:c} de votre héros.",
+  "2126": "\u003cb\u003eFIN DE TOUR\u003c/b\u003e : Gagne 1\\_{#SIGHT} si aucun adversaire ne se trouve autour\\_\u003csprite name\u003dcell_around/\u003e {heroGender: m[de lui] f[d\u0027elle]}.",
   "289": "Bunelame",
-  "36632": "Piochez le sort {Spell:531} quand vous jouez un sort sur un adversaire à plus de {cell:c} de votre héros.",
+  "36632": "\u003cb\u003eFIN DU TOUR\u003c/b\u003e\\_: Piochez 1\\_sort si vous avez {value:(nb-1)} sort ou moins dans votre main.",
   "62353": "Expingole",
-  "85376": "Inflige {magicalDamage:dmg} quand vous jouez un sort sur un adversaire à plus de {cell:c} de votre héros.",
+  "85376": "Gagne 1\\_{#sight} quand vous jouez un sort coûtant {value:pa}\\_{%PA} ou plus.",
   "17293": "Se soigne d\u0027autant que de soins reçus par les compagnons ou invocations alliés.",
   "49603": "Ambre Tamashi",
   "78162": "\u003cb\u003eATTAQUE\u003c/b\u003e\\_: Les {Summoning:773[NOCTURIENS]} alliés déclenchent {explosion:ex}.",
@@ -91,26 +70,10 @@
   "27929": "Inflige son {%at} à l\u0027adversaire ayant le plus de {%pv} quand {heroGender: m[il] f[elle]} entre en {#AGONY}.",
   "81887": "Gantares des Cendres",
   "80591": "Piochez un sort quand {heroGender: m[il] f[elle]} déclenche {#EXPLOSION}.",
-  "13391": "",
-  "42565": "",
-  "69032": "",
-  "64030": "",
-  "2686": "",
-  "90653": "",
   "95166": "",
   "36975": "",
-  "86602": "",
-  "41204": "",
-  "938": "",
-  "11809": "",
-  "62217": "Spectre",
-  "21416": "{#INVULNERABLE}\nNe peut plus utiliser la {%reserve} de {%PA}.\nNe peut plus invoquer de Compagnons.",
   "93165": "Fantome",
   "18899": "{#INVULNERABLE}\nNe peut plus invoquer de Compagnons.",
-  "72517": "Flamboyante Kasaï",
-  "793": "+1\\_{%pm} pour le tour\\v quand vous jouez un sort \u003cb\u003eFEU\u003c/b\u003e\u003csprite name\u003dfire\u003e.",
-  "95370": "Bouvaloir Orok",
-  "40461": "Inflige son {%at} à la cible quand il \u003cb\u003echarge\u003c/b\u003e.",
-  "16616": "Flamboyante Kasaï",
-  "1": "Votre Héros gagne 1\\_\u003cb\u003ePM\u003c/b\u003e pour le tour chaque fois que vous jouez un sort FEU\u003csprite name\u003dfire\u003e."
+  "19371": "Survivant",
+  "59368": "+5\\_{%AT} tant qu’il possède de l’{%AR}."
 }
\ No newline at end of file
diff --git a/data/json/dico/Worlds.json b/data/json/dico/Worlds.json
index 0a0dc4427b57c96c83b6356f91409f197f918bd8..a1ce3494dc89f7e25bd2b57317e707e96ce6c4c2 100644
--- a/data/json/dico/Worlds.json
+++ b/data/json/dico/Worlds.json
@@ -1,5 +1,5 @@
 {
-  "489": "Worlds",
+  "1036": "Worlds",
   "74198": "Ho, bonjour jeune aventurier\\_!",
   "76032": "Ah la fougue de la jeunesse\\_! Laissez moi reprendre mon souffle...",
   "72844": "M\u0027accompagner\\_? Dans cette folie meurtière contre les Chafers\\_?",
@@ -86,7 +86,6 @@
   "61264": "T\u0027es prêt à en découdre\\_? OK\\_!",
   "29975": "Qu\u0027y a-t-il\\_? Vous aussi la science vous appelle\\_?",
   "31710": "Island Colpoteur",
-  "43646": "Colporteur",
   "89291": "Je remarque un cas médical fascinant derrière cette porte. Je dois l\u0027étudier !",
   "75131": "Je n\u0027irais pas plus loin",
   "68410": "Craqueleur...",
@@ -105,7 +104,6 @@
   "13209": "Ah, la fougue de la jeunesse\\_! Laissez-moi reprendre mon souffle...",
   "20129": "Grâce à votre aide, moins de ces horreurs arpenterons le monde des Douze...",
   "45203": "Paré à mouiller ?",
-  "70363": "HAHAHA\\_! Avec plaisir, allons les désosser jusqu\u0027au dernier\\_!",
   "84642": "Colombe, ma chérie...",
   "70441": "Eh, le chef ! Ton règne va finir !",
   "93834": "C\u0027est toi qui entres dans le camp et qui casses tout ? Tu vas recevoir la raclée du chef !",
@@ -128,7 +126,6 @@
   "10342": "Voyez-vous, votre avis n\u0027est aucunement requis...",
   "61516": "NON\\_! Mère\\_!",
   "48943": "Colombe\\_! Sauve-toi ma chérie, ne reste pas ici\\_!",
-  "57963": "Colporteur Chafer",
   "85062": "On devrait l\u0027éviter celui-là, il n\u0027a pas l\u0027air net...",
   "20499": "Les morts se lèvent mon ami : fuyez, ou combattez !",
   "93921": "Mon frère Roméro s\u0027occupe de réguler les Chafers du donjon, peut-être le croiserez si vous y allez.",
@@ -137,10 +134,8 @@
   "45349": "Miaaaou, bonjour l\u0027aventurier ! Un nécromancien a élu domicile dans cette ancienne crypte.",
   "71607": "Il corrompt les âmes des défunts qui ont péri lors de la montée de eaux pour, semble t-il, créer une armée de morts-vivants.",
   "16328": "Si vous le souhaitez, notre guilde fait appel aux guerriers les plus courageux pour tenter de contrer ce monstre et contenir les Chafers. Soyez prudent.",
-  "24977": "Salut brave combattant. Ce passage secret mène dans les profondeurs de l\u0027île.",
-  "28589": "Des gardiens surpuissants s\u0027y trouvent et s\u0027entrainent à la protection de leurs maîtres.",
+  "28589": "A vous de juger. Empruntez le passage, et vous serez récompensé à la hauteur de votre courage. Echouez, et ce caveau sera votre tombeau.",
   "95886": "Bonjour, et bienvenue sur ce pâturage Bouftou. Viande, lait, laine... Les ressources produites ici sont précieuses.",
-  "58895": "Chalutations ! Tu as vu tous ces Bouftous malades ? Si ça continue, il n\u0027y aura bientôt plus de Bouftou sains...",
   "99595": "Miaou !",
   "25205": "*Ronronne*",
   "89662": "Donjon Bouftou",
@@ -190,7 +185,6 @@
   "72907": "Jamais\\_!",
   "41137": "Cette fois je n\u0027ai plus le choix...",
   "35285": "Je rentre à Bonta, nous nous y reverrons peut-être\\_!",
-  "33972": "Colporteur Cochon",
   "91934": "Soldat de Bonta\\vtahu-bahu au palais\\vinsolent raffut",
   "87288": "Insolent\\_!",
   "16085": "Espion débusqué\\vmise en bouche de premier choix\\vcuit au court bouillon.",
@@ -275,7 +269,6 @@
   "82971": "Bientôt, je serai prêt pour le combat final.",
   "46619": "T\u0027as pas le niveau pour m\u0027accompagner. Go pex, noob, et reviens plus tard.",
   "72425": "Pas par là\\_! MENFOU, j\u0027y vais pô...",
-  "9702": "Colporteur",
   "87598": "\u003ci\u003eJour 342\nJ\u0027approche d\u0027une nouvelle île. Il semble qu\u0027elle soit habitée malgré la chaleur qui s\u0027en dégage.\u003c/i\u003e",
   "40314": "\u003ci\u003eJour 346\nLa population est agressive, il faut vite que je trouve le moyen de faire demi-tour.\u003c/i\u003e",
   "92468": "\u003ci\u003eJour 347\nTrop tard, ils passent à l\u0027action ! Pourparler, POURPARLER !!\u003c/i\u003e",
@@ -332,9 +325,8 @@
   "29797": "Nya-chanté aventurier !\\vCette île est le repaire d\u0027un des derniers clans Bwork ayant survécu au cataclysme.",
   "25247": "Une belle brochette de brutes épaisses, à l’intelligence très relative...",
   "30322": "Si vous souhaitez vous aventurer sur ces terres hostiles, je peux vous y aider. Mais si ça sent le roussi, je ne pourrai rien pour vous...",
-  "89609": "Les Bworks les plus malicieux et les plus fous s’y terrent avec leurs sbires pour préparer les pires mauvais coups.",
-  "69659": "On raconte que cette échelle est faite des os des malheureux qui ont voulus s’aventurer là dedans.",
-  "80180": "Colporteur Bwork",
+  "89609": "Des grognements sourds... et effrayants...",
+  "69659": "Vous entendez ?\nVenir des profondeurs...",
   "85283": "Je vois que vous brûlez d\u0027impatience d\u0027en découdre, mais prenez garde :",
   "6018": "Cette île est soumise au bon vouloir du volcan qu\u0027elle renferme, et il est de plus en plus instable depuis que les Bworks en exploitent les ressources.",
   "82811": "Les séismes se font de plus en plus violents dans les galeries ouest, mais les Bworks ne semblent pas saisir l’importance du danger...",
@@ -411,17 +403,12 @@
   "1849": "Colporteur",
   "9816": "Colporteur",
   "51614": "Colporteur",
-  "54943": "Colporteur",
-  "50188": "Colporteur",
-  "7069": "Colporteur",
-  "12401": "Colporteur",
   "37167": "Colporteur",
   "83758": "Colporteur",
   "19038": "Colporteur",
   "9682": "Colporteur",
   "11306": "Colporteur",
   "22714": "Colporteur",
-  "95844": "Colporteur",
   "53116": "Colporteur",
   "41159": "Colporteur",
   "25540": "Colporteur",
@@ -463,8 +450,6 @@
   "95091": "Quand même, ça pourrait aller plus vite...",
   "53517": "Bah t\u0027inquiète, tout vient à point...",
   "21197": "J\u0027aime pas attendre...",
-  "98333": "Tu trouveras personne ici mon p\u0027tit.",
-  "57520": "L\u0027aubergiste n\u0027a pas encore été designé, reviens plus tard pour une mousse.",
   "65320": "Tu trouveras personne ici mon p\u0027tit.",
   "6084": "Le tavernier n\u0027a pas encore été fabriqué.",
   "60979": "Si c\u0027est pas malheureux ce manque de discernement sur les priorités...",
@@ -478,14 +463,53 @@
   "65874": "Au plus j’en élimine, au plus il en vient... Ca ne finira donc jamais...",
   "45886": "Colporteur",
   "94108": "Colporteur",
-  "54598": "Colporteur",
   "98114": "Colporteur",
   "37333": "Colporteur",
-  "27998": "Colporteur",
-  "41249": "Colporteur",
-  "19816": "Colporteur",
-  "23932": "Colporteur",
   "6125": "Halte, où allez-vous comme ça ? Un jogging ? Promener votre chienchien ? Ok, allez-y.",
   "23522": "J\u0027ai des fourmis dans les jambes à force de rester confiné sur ma cellule...",
-  "83264": "..."
+  "83264": "...",
+  "16623": "Il a même pas de chienchien...",
+  "79157": "Regarde mes pages ! Elles sont vides, et tout humides !",
+  "33634": "C’est pas une vie d’être prisonnier de cette île...",
+  "74690": "Il me faut des aventures à raconter...",
+  "67333": "Au moins toi, le monde t’attend...",
+  "95636": "Oui, bon, ce qu’il en reste... Mais quand même !",
+  "84722": "Tu devrais t’exercer un peu avant d’y aller. Je crois en toi hein, mais... bon... bref ! Tiens, regarde, un Karab !",
+  "70363": "HAHAHA\\_! Avec plaisir, allons les désosser jusqu\u0027au dernier\\_!",
+  "81399": "Aaah misère...",
+  "36465": "C’est pas une vie d’être prisonnier de cette île...",
+  "97056": "Regarde mes pages !\nElles sont vides, et tout humides !",
+  "88086": "Il me faut des aventures à raconter...",
+  "6601": "Au moins toi, le monde t\u0019\u0027attend...",
+  "8583": "Oui, bon, ce qu’il en reste... Mais quand même !",
+  "27851": "D\u0027ailleurs, tu devrais t’exercer un peu avant d’y aller.",
+  "11371": "Pas mal, pas mal du tout !\nJe vois que tu as bien retenu ma petite leçon !",
+  "97104": "Allez, on ne se relâche pas, il y en a d’autres !",
+  "17909": "L’heure n’est pas à la causette... Nous sommes envahis, regarde !\\_",
+  "65160": "Tu t’en sors pas trop mal...\nIl est temps de révéler tes vrais pouvoirs...",
+  "6513": "Souviens-toi à quel dieu tu appartiens, et choisis ton arme !",
+  "40897": "...",
+  "51827": "T\u0027as choisi l\u0027arme pour le look, avoue ?",
+  "74532": "Peu importe : il faut t\u0027entraîner pour maîtriser tes nouveaux pouvoirs !",
+  "77474": "Tu as compris les bases, à présent il te faut apprendre à contrôler tes pouvoirs.",
+  "6940": "Les Crabes trouvent leur utilité, finalement...",
+  "54305": "On dirait bien que tu commences à saisir le truc...",
+  "65761": "Je te propose une dernière épreuve. Si tu la réussis, tu seras prêt à voyager au-delà de cette île.",
+  "80577": "... Veinard.",
+  "8173": "Tu t’en es bien tiré.\nPour l’heure, ton apprentissage s’arrête ici.",
+  "1388": "Allez, prends le large et utilise le Zaap : il paraît que certaines Nations ont subsisté, tu devrais y trouver d’autres survivants, comme toi.",
+  "24671": "Et puis surtout... N’oublie pas de revenir et de tout me raconter, tu me dois bien ça !\\_",
+  "94655": "Mais attention, tu vas devoir t’adapter, et te surpasser...",
+  "42546": "Je crois en toi bien sûr, mais... bon... tu vois... bref ! Tiens, regarde, un Karab !",
+  "14048": "Ca n\u0027est que justice après tout ! Allez, hop hop !",
+  "42344": "Ces crabes... Ils n\u0027arrêtent pas d\u0027essayer de me becter...",
+  "28795": "C\u0027est en tout cas l\u0027avis de mon Maître.",
+  "96010": "Nombreux sont les guerriers qui, comme vous, ont voulu s\u0027aventurer au coeur du cratère.\nAucun n\u0027est jamais revenu.",
+  "98611": "Puisque vous brûlez de curiosité, allez-y, et voyez par vous-même  jusqu\u0027où ce chemin peut vous conduire...",
+  "73683": "De puissants guerriers rôdent dans les abîmes de l\u0027île.\nLeur âme, damnée, en est prisonnière pour l\u0027éternité.",
+  "75418": "Vous souhaitez visiter ? Quelle merveilleuse idée !",
+  "81179": "Le mieux est de découvrir l\u0027endroit par vous-même, il s\u0027agit sans conteste de la pièce maîtresse de l\u0027île. L\u0027arrière-cuisine, en quelques sortes.",
+  "31600": "Les voyageurs qui s\u0027y aventurent à corps perdu en ressortent bien meilleurs, tant ils y sont savamment préparés...",
+  "22679": "Il n\u0027a suffi que d\u0027un petit souffle de non-vie pour les soumettre...",
+  "73697": "Imaginez avec quelle facilité vous pourriez rejoindre les rangs des maudits..."
 }
\ No newline at end of file
diff --git a/data/json/dico/Zones.json b/data/json/dico/Zones.json
index 7b66f7ea16c09cd36e1829bd38d540bfc7bfaf3d..c614a09a428b169c6ba6e14cbd9113bcf7cc590b 100644
--- a/data/json/dico/Zones.json
+++ b/data/json/dico/Zones.json
@@ -1,5 +1,5 @@
 {
-  "230": "Zones",
+  "1036": "Zones",
   "84045": "Havre-Île",
   "74356": "Havre Ile",
   "85821": "L\u0027Île des Chafers",
@@ -228,5 +228,11 @@
   "28181": "Ruine Ancienne 3",
   "89077": "Nation de Bonta",
   "34802": "Caserne de Bonta",
-  "66480": "Epicerie"
+  "66480": "Epicerie",
+  "63074": "Chez Willard",
+  "89819": "Donjon des Crabes",
+  "24324": "Epave I",
+  "50150": "Cale du Krabken",
+  "4619": "Epave II",
+  "20241": "L\u0027Île des Gelées"
 }
\ No newline at end of file
diff --git a/src/main/java/github/com/oxal/embed/Embedeable.java b/src/main/java/github/com/oxal/embed/Embedeable.java
deleted file mode 100644
index 34ab358f7dd61de4c6c8908cd7815a4a685da123..0000000000000000000000000000000000000000
--- a/src/main/java/github/com/oxal/embed/Embedeable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package github.com.oxal.embed;
-
-import github.com.oxal.command.option.Option;
-import org.javacord.api.entity.message.embed.EmbedBuilder;
-
-import java.util.Optional;
-
-public interface Embedeable {
-
-    EmbedBuilder getEmbed(String lang, Optional<Option> option);
-}
diff --git a/src/main/java/github/com/oxal/embed/pvp/SpellEmbed.java b/src/main/java/github/com/oxal/embed/pvp/SpellEmbed.java
deleted file mode 100644
index 01441190e39e2e8af56f22d0567aa79267da30c5..0000000000000000000000000000000000000000
--- a/src/main/java/github/com/oxal/embed/pvp/SpellEmbed.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package github.com.oxal.embed.pvp;
-
-import fr.oxal.v2.waven.entity.base.spell.Spell;
-import github.com.oxal.command.option.Option;
-import github.com.oxal.utils.EmbedUtils;
-import github.com.oxal.embed.Embedeable;
-import org.javacord.api.entity.message.embed.EmbedBuilder;
-
-import java.util.Optional;
-
-public class SpellEmbed extends Spell implements Embedeable {
-    public SpellEmbed(int id) {
-        super(id);
-    }
-
-    public SpellEmbed(Spell spell){
-        super(spell.getId());
-    }
-
-    @Override
-    public EmbedBuilder getEmbed(String lang, Optional<Option> option) {
-        return EmbedUtils.getDefaultEmbed(lang,this, option);
-    }
-}
diff --git a/src/main/resources/lang/en/command.json b/src/main/resources/lang/en/command.json
index d618131c56a70d298a7189bd23e556599179f592..b3576f086326368fe98d2571d84029506573004c 100644
--- a/src/main/resources/lang/en/command.json
+++ b/src/main/resources/lang/en/command.json
@@ -1,3 +1,3 @@
 {
-  "1" : "palu"
+  "1": "paluEN"
 }
\ No newline at end of file
diff --git a/src/main/resources/lang/en/lang.json b/src/main/resources/lang/en/lang.json
index db521b16a49c6ad28fc3c99e5b5e3007e1f254ab..1b0f6ad74d206896b187fa92105edd4d7d55603e 100644
--- a/src/main/resources/lang/en/lang.json
+++ b/src/main/resources/lang/en/lang.json
@@ -7,7 +7,7 @@
   "MAX_ENTITY_LIST": "+ %d more entities",
   "EMPTY_LIST_MESSAGE": "No entity has been recognized or this entity has no requested item",
   "USE_COMMAND": "Use `%s%s command` to understand how to use this command\nexemple : `%s%s %s`",
-  "COMMAND_PRESENTATION": "%s%s : %s",
+  "COMMAND_PRESENTATION": "• %s%s : %s",
   "NAMES_EXPLICATION": "`%s[name1, name2]` : means you can use either name1 or name2\nexample: `%sname1` or `%sname2`",
   "NO_FOUND_COMMAND": "No command were found"
 }
\ No newline at end of file
diff --git a/src/main/resources/lang/fr/command.json b/src/main/resources/lang/fr/command.json
index d618131c56a70d298a7189bd23e556599179f592..4f31bfcb1a08dca3a3787d0feebf6ab2d8b6e494 100644
--- a/src/main/resources/lang/fr/command.json
+++ b/src/main/resources/lang/fr/command.json
@@ -1,3 +1,3 @@
 {
-  "1" : "palu"
+  "1": "paluFR"
 }
\ No newline at end of file
diff --git a/src/main/resources/lang/fr/lang.json b/src/main/resources/lang/fr/lang.json
index 3dbb8e3bd55b69ca0ffe4d037903e5e821c5d9cb..5279d2b7e4a9c5f44ce7cd7b6ead2a4e4b9ccb56 100644
--- a/src/main/resources/lang/fr/lang.json
+++ b/src/main/resources/lang/fr/lang.json
@@ -7,7 +7,7 @@
   "MAX_ENTITY_LIST": "+ %d entités en plus",
   "EMPTY_LIST_MESSAGE": "Aucune entité n'a été reconnu ou cette entité n'a aucun élément demandé",
   "USE_COMMAND": "Utilisez `%s%s commande` pour comprendre comment utiliser cette commande\nexemple : `%s%s %s`",
-  "COMMAND_PRESENTATION": "`%s%s` : %s",
+  "COMMAND_PRESENTATION": "• `%s%s` : %s",
   "NAMES_EXPLICATION": "`%s[name1, name2]` : signifie que vous pouvez utilisez soit name1 ou name2\nexemple : `%sname1` ou `%sname2`",
   "NO_FOUND_COMMAND": "Aucune commande n'a été trouvé"
 }
\ No newline at end of file